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
Some linting for spec/integration/gorilla_editor_spec.rb
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.
First pass at overlapping features
Store the data about the span in the objet.

Now we just need to add it to the data segment of the span
Merge remote-tracking branch 'origin/master' into overlapping-features
Put more information into data-features

This should be some identifying information about the spans.
Editing is very broken right now.
[overlapping-features] Insert seems to work again.

Put more work in to keeping track of indices. Hopefully will be more stable for
the future.
[overlapping-features] More work

- Update specs to correspond with new naming convention for spans
- Editing features seem to be working again
Merge pull request #58 from GorillaApp/overlapping-features

Overlapping features
Merge remote-tracking branch 'origin/master' into feature-model
added feature library and enzyme models, no code for them yet