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
Merge remote-tracking branch 'origin/master' into feature-model