The current overview is a mess.
This pull commit will make it look more clean.

All permissions are alliged between the columns and the master rights
have been enchanced with all its rights.

fix #742

Cosmetic change in menu

Force utf-8 encoding for ldap omniauth_info.name

Rescue from CharlockHolmes failures.

Fix very minor spelling issue.

Fast automerge

Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb

Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Conflicts:
	Gemfile
	Gemfile.lock

Fix typo: "less then" => "less than"