image and video views update
Merge branch 'master' of https://github.com/Motivable/motivable

Conflicts:
	media/js/main.js
	protected/views/image/view.php
	protected/views/video/view.php