Changed the broken code for staging
merge conflict resolved
Change in most viewd and css
conflict at home controller
change in css and added missing newest record
Change in password preference code
Merge branch 'minor_changes' into from_june_12
Added invite frnds migration with display preferences
Added password protected scenario to cameos
Invitation to contribute and private shows handling
missing object reference added
Added deleting cameo and displaying the video at edit page.
Change in current user
Change in displaying checkbox
minor changes regarding views,description,count,public private and UI changes
Merge branch 'minor_changes' into from_june_12
Small changes regarding carousel
Resolved the friend request missing code
validating video file formats
Merge branch 'from_june_12' into minor_changes