ff
Merge branch 'master' of https://github.com/funlake/dothing

Conflicts:
	demo/assets/js/admin.js
	demo/views/modules/admin/user/edit.php