Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group

Fixes #2166

Fixes #2617

Fixes #2563

add default for Settings['satellites']

Remove wget dependency, now all curl

'namespace' should be exposed via the API

clean application_helper a bit

Auth: Net::BER::BerIdentifiedStrings to Strings

Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb

Fix typo in installation guide.