Merge branch 'u_catalog' of https://git.star7th.com/star7th/showdoc_open into u_catalog

# Conflicts:
#	server/Application/Api/Controller/UserController.class.php