update wizard

update wizard
Merge branch 'master' of https://github.com/liuqiang0923/studiostare

Conflicts:
	studiostare/WebContent/WEB-INF/ftls/manage/admin-client-edit.ftl
delete newsedit

delete newslist