Merge remote-tracking branch 'origin/fix-delete' into feature-hover-dialog
Merge remote-tracking branch 'origin/fix-backspace' into feature-hover-dialog

Conflicts:
	spec/support/editor_helper.rb
Merge branch 'fix-delete' into feature-hover-dialog
Add deprecated error message to json_request
Got basic hover dialogs working. Just show name of feature
Merge pull request #64 from GorillaApp/feature-hover-dialog

Feature Hover Dialog