remov
change things
Merge branch 'master' of ssh://github.com/funlake/dothing

Conflicts:
	demo/modules/admin/user.php