Merge branch 'master' of https://github.com/GorillaApp/gorilla into feature-model
Merge branch 'Feature-frontend' of https://github.com/GorillaApp/gorilla into feature-model
added a test that is commented out, nothing should change
Merge remote-tracking branch 'origin/master' into feature-model

Conflicts:
	spec/models/feature_spec.rb
Merge remote-tracking branch 'origin/master' into feature-model

Conflicts:
	spec/models/feature_spec.rb
Add some styles to make inputs look more consistent across chrome/firefox
Merge remote-tracking branch 'origin/master' into pretty
Merge remote-tracking branch 'origin/master' into pretty
Remove unused variable to edit_controller
Some linting for spec/integration/gorilla_editor_spec.rb
Merge pull request #56 from GorillaApp/pretty

Minor UI changes
Merge remote-tracking branch 'origin/master' into overlapping-features
Work on namespacing. G.*
Working on namespacing
Update javascript specs
Spread some long lines over a few lines.
Provided arg to Autosave.request() in Autosave.js. Fixed delete action in Autosave model so successive deletes do not produce 500 internal server error
prepping to include user accounts in deletion of autosaved file
Added user account as parameter to delete autosave
When user cancels autosave prompt it deletes autosave file