Changed ApplicationController to ActionController::Base
Merge branch 'master' of https://github.com/ogom/mr_video into ogom-master
Merge branch 'ogom-master'