Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb

user_color_scheme_class with no current_user

fixed commit tab page shows commit log twice

Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project

This refactors the `user_color_scheme_class` to use
a hash with a default.  This prevents problems
with workers that don't have access to the
current_user.

Fixes issue #2758

Fix bug with team assignation on project from #4109

Group/Team Atom feed 500 error

Fix for https://github.com/gitlabhq/gitlabhq/issues/4157

Fix for https://github.com/gitlabhq/gitlabhq/issues/4157

Fix rake gitlab:env:info command line in Issue tracker guidelines.

Style target notes for easy visual identification

Fix not displaying a slash after namespace.

Remove user directory path assumptions

Update api docs and remove old attribute from User entity.

Update suggestion for Check.rake

grammar fix in an error message (very minor change)

adding update info regarding gitlab-shell config.yml (re: dashboard update problems)

The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity.

Add color scheme ID to API User entity

Jira - Fixed Jira Issue tracker support