Most collection functions are added to ss, now we need to do styling
putting most of the file actions back into the collection page
Most collection functions are added to ss, now we need to do styling
Added date uploaded to the collections display on dashboard
Upping hydra-collections to get collection search capability
Added more functions to cog in the Dashboard, 'Add to Collection' option now opens in a modal window
first try got test to run and fail

Conflicts:
	Gemfile
	Gemfile.lock
Completing merge of collections and new sufia with jfiesiens changes and making sure all spec run