update
Merge branch 'master' of https://github.com/ruoan/wsp

Conflicts:
	app/Controller/LoginsController.php
Merge branch 'master' of https://github.com/ruoan/wsp