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

Conflicts:
	route/user.php
user
user
Merge branch 'master' of https://github.com/harviacode/14112014