Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb

Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Conflicts:
	Gemfile
	Gemfile.lock

Fix typo: "less then" => "less than"

This gives us Github Flavored Markdown, which is awesome.

Display Milestones without a due date as active

Fix a few grammatical mistakes in profile view.

Fixed typo in label

Fixed typo

2. Fixed bug: post-receive file was not added when create project via admin

Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers