AFinish
Merge remote-tracking branch 'origin/master' into fix-hover-dialog

Conflicts:
	app/assets/javascripts/gorilla-editor.js.coffee
Merge pull request #114 from GorillaApp/fix-hover-dialog

Fix the hover dialog.