Conflict
Merge branch 'master' of https://github.com/nadirq/freelens.us
Merge branch 'master' of https://github.com/nadirq/freelens.us

Conflicts:
	protected/models/Photos.php
	protected/modules/cabinet/controllers/PhotosController.php