download preferences for a show is done
migration for download preferences are added
merge conflict resolved
run rake db:migrate
video stitching func is modified
video file format acceptance
Merge branch 'development' of https://github.com/dputtannaiah/rvidi into development
change in text and fullname
password_protected changes to form instead of overlay