...
Merge branch 'master' of https://github.com/d3cr1pt0r/web-hairsaloon

Conflicts:
	app/modules/backend/controllers/UserController.php