Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Make UI changes as per the PO instructions
First cut at a remove_parts. Still needs to rewire the button link
Test remove_part
Display error message and redirect to group index page if name taken (VOV-1973)
Use expect instead of lambda in tests
Marking some tests as pending for now
Using the much simpler solution to destroying master files
Minor change to the color of the Upload button
remove groups from the role map and clean up the factory
Merge pull request #150 from atomical/bugfix/all-tests-should-use-factory-girl-for-seed-data

Bugfix/all tests should use factory girl for seed data
Add unpublished count and links to all or just unpublished in collection index
Merge pull request #152 from avalonmediasystem/feature/VOV-1995

Feature/vov 1995
Add flash error to index view
Merge pull request #141 from avalonmediasystem/bugfix/VOV-1973

should redirect to group index page with a notice when group name is already taken