Add author of new init script
remove old assets before compiling
Prevent empty public projects from throwing exceptions

GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
Merge branch 'update_changelog' of /home/git/repositories/axil/gitlabhq
Update gitlab_git to version 2.3.1
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Restyle tree table UI
Restyle event title
Fix API::MergeRequest

Fixes #5144 Refs #4996
Make users theme configurable

GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
Defaulted theme to MARS

Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
Version 6.1.0
Fix hover for tree view
Merge branch '6-1-stable'
Corrects the update document to match the version of gitshell specified in the install document (1.7.1)
Merge pull request #5145 from hiroponz/fix-api-merge-request

Fix API::MergeRequest
Merge pull request #5116 from karlhungus/feature-configurable-theme

Make users theme configurable
Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projects

Prevent empty public projects from throwing exceptions
Merge pull request #5136 from f0k/patch-1

Remove old assets before compiling new ones
Merge pull request #67 from gitlabhq/master

Update