Merge remote-tracking branch 'origin/feature/VOV-1776' into feature/vov-1649

Conflicts:
	app/controllers/admin/collections_controller.rb
Merge branch 'feature/vov-1649' of github.com:avalonmediasystem/avalon into feature/vov-1649

Conflicts:
	app/controllers/admin/collections_controller.rb
change param name and destroy collection