-
Merge branch 'develop' of https://github.com/joechen1018/linklies into develop

Conflicts:
	app/Controller/UsersController.php
some tweak around
Merge branch 'develop' of https://github.com/joechen1018/linklies into develop