User
Merge branch 'master' of ssh://github.com/jessyangyang/duyuMVC

Conflicts:
	api/stem/application/controllers/User.php
test and doc