user auth
Merge branch 'master' of https://github.com/nielitcms/nielitcms

Conflicts:
	app/controllers/PhotoController.php