Merge branch 'master' of github.com:noplanb/tbm-server

Conflicts:
	app/controllers/videos_controller.rb