#348 WIP formatting of media tab
remove setup comments
#348 add video player back in for videos
Change video dimensions to 300x300 to match photo thumbnail size
Fix title alignment on videos
A touch of cleanup
#348 stub out poster method for assets
Merge branch 'development' into rb/348-cc-media-tab

Conflicts:
	app/models/custom_collection.rb
	app/models/custom_collection_item.rb
	app/models/program.rb
	app/models/video.rb
	app/views/custom_collections/show.html.erb
Merge pull request #369 from afred/rb/348-cc-media-tab

Rb/348 cc media tab