test
Merge branch 'master' of https://github.com/Motivable/motivable

Conflicts:
	protected/views/video/view.php