Conflicts:
	Gemfile.lock

Updated gems. Specs all still pass. (Devise pinned to 1.x)

Add to schema.rb the increased MR text column size.

This change was made in a migration in commit 17a88bb6.
Because the schema.rb is checked in, the column size increase should
be here, too.

Pinned devise to the 1.x series for the moment. Going to 2.0 threw
deprecation warnings about:
* Devise.stateless_token= (append :token_auth to Devise.skip_session_storage instead)
* devise.registrations.reasons in yml (use devise.registrations.signed_up_but_REASON)

in /etc/init.d/gitlab, I add "-l" option in sh command

update launchy to fix an NoMethodError on development and test mode

spelling mistake 'successfull'

When the email address is empty gitlab will give a 500 error

Make permission overview structured

Allow short project names

We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...

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.

Since some conversion tools do commits with an empty commiters email
address gitlab will fail with a 500 error

fix #742

Cosmetic change in menu

Force utf-8 encoding for ldap omniauth_info.name

Rescue from CharlockHolmes failures.

Fix very minor spelling issue.