Merge https://github.com/harviacode/14112014

Conflicts:
	route/user.php
Merge https://github.com/harviacode/14112014