update
Merge branch 'master' of https://github.com/xwjchina/account-manager.git

Conflicts:
	account_manager/src/main/webapp/WEB-INF/jsp/main.jsp