fix resize for main carousel
Merge branch 'feature/photoalbum_#35' into staging

Conflicts:
	app/uploaders/photo_album/photo_uploader.rb