admin
Merge branch 'master' into work

Conflicts:
	protected/components/WebUser.php
	protected/views/layouts/main.php
Merge branch 'master' into work
update style
Merge branch 'master' into work
Merge branch 'master' into work
Merge branch 'master' into work
admin: edit user
admin: create and delete user