Signed-off-by: 南博æ? <nanbowen@fuego.cn>
Merge branch 'dev' of https://github.com/TinderTeam/copydp into dev

Conflicts:
	code/copydp/Home/Lib/Action/SystemManageAction.class.php
	code/copydp/Home/Tpl/Index/login.html
	code/copydp/Home/Tpl/SystemManage/index.html

Signed-off-by: 南博æ? <nanbowen@fuego.cn>
Signed-off-by: 南博æ? <nanbowen@fuego.cn>