ron's
Merge branch 'master' of https://github.com/rlamostre0/hack-server-master

Conflicts:
	protected/components/UserService.php
	protected/controllers/UserController.php