login profile fixed
Merge branch 'master' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/controllers/UsersController.php
fixed usercontroller link