initial work on collections
a better starting place for collection tests
comment out all the generic collections stuff; reimplement later
move collections into a mixin module
collections are working; no descMetadata elements yet
Merge branch 'feature/protocollections' into develop

Conflicts:
	app/models/generic_asset.rb
travis setup