Migrations for convertion merge_status added
Database schema updated
State machine added for merge_status field
class.self methods moved to scopes
human_merge_status replaced by human_merge_status_name
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2

Conflicts:
	app/models/merge_request.rb
Fix automerge detection client-side since #3056
Merge branch 'Undev-state-machine-stage-2'