* code for task#530.
Merge branch 'master' of git@github.com:xirang/chanzhiext

Conflicts:

	eps/templates/zui/system/module/links/ext/view/admin.html.php
	eps/templates/zui/system/module/nav/ext/view/admin.html.php
	eps/templates/zui/system/module/site/ext/view/setbasic.html.php
	eps/templates/zui/system/module/site/ext/view/setoauth.html.php