Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

GitLab is not yet downloaded at this point in the installation guide.

Fixes #2334

V4.0 API fixes

Conflicts:
	vendor/assets/javascripts/branch-graph.js

Fix and refactoring gfm_autocomplete

Rename tasks

Rename add_users_to_project_teams to gitlab:import:all_users_to_all_projects

Rename gitlab:app:db_* to gitlab:backup:db:*
Rename gitlab:app:repo_* to gitlab:backup:repo:*
Rename *_dump to *_create