commit
Merge branch 'master' of https://github.com/mantonio/sslgroup

Conflicts:
	controllers/photoController.php