Use mercury-editor as a html editor.
Merge branch 'html-editor'

Conflicts:
	Gemfile
Resolve conflict from html-editor branch.