Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb

Sort groups alphabetically on dashboard page

Minor changes to installation and databases docs.

Change .gitignore to ignore logrotated log files.

Add option to disable username changing

Ssh fingerprint fix

Fix link to owner of group and team in admin interface