Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb

Fix typo in installation guide.

Public HTTP clones and remove auth request for public projects

Change "th" to "the"

* Properly name columns in Pages and History views
* Link to Authors
* Make views more consistent

Fix to pages links

Changed the link in the pages of the wiki to the direct link instead of the first created page

Fix for archive download (method path missing)