video uploader with integration
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	app/views/admin/subjects/_form.html.erb