first draft of logo icon
fix video height
removing unused code
remove whitespace from group name
remove whitespace from autocomplete
Display running operation instead of last completed
Fix several bugs with masterfile/mediaobject deletion
Add warning when deleting MasterFile with no parent MediaObject
Remove duplicate MediaObject check
remove whitespace from name
remove whitespace from name
remove whitespace from name
Merge pull request #360 from avalonmediasystem/bugfix/VOV-1357

Bugfix/vov 1357
add / remove user whitspace strip
Merge pull request #357 from atomical/bug/VOV-2846/trim-whitespace-for-groups

trim whitespace for group name and autocomplete
Improvements to progress bar
Merge pull request #359 from avalonmediasystem/bugfix/VOV-2751

Display running operation instead of last completed
fix filename
rename in erb file
Merge branch 'develop' into feature/VOV-2810/link-back-to-avalon-in-player

Conflicts:
	Gemfile