line commented. not used
Merge branch 'master' of https://github.com/mrmb/Time-Earth

Conflicts:
	protected/controllers/VideoController.php
Merge branch 'master' of https://github.com/mrmb/Time-Earth