Changes in encoding service and admin setting UI changes
Fix migration query
Merge pull request #404 from pushpakpop/master

Video preload set to true, Album gallery template issue fixed
Video encoding and video thumbnails
Fix shorcode global isssue
edit video thumbnails
Merge pull request #405 from Ritesh-patel/master

Video encoding and edit video thumbnails
Merge branch 'master' of https://github.com/rtCamp/buddypress-media
Regenerate video thumbnail bulk action added
Merge pull request #406 from Ritesh-patel/master

Regenerate video thumbnail bulk action added
Merge branch 'master' of git://github.com/pushpakpop/rtMedia into pushpakpop-master

Conflicts:
	app/assets/css/main.css
	app/assets/js/rtMedia.backbone.js
update css
Merge branch 'master' of https://github.com/rtCamp/buddypress-media
select_privacy_ui function updated
bug fixed for redirection when redirect=true in shortcode for anywhere uploader