add applicants list in page of admin
Merge branch 'master' of https://github.com/prod-dev/sannong

Conflicts:
	src/main/java/com/sannong/presentation/controller/PersonalCenterController.java
	src/main/java/com/sannong/service/impl/UserServiceImpl.java
	src/main/resources/user.map.xml
fix merge error
Change column name updateTime to update_time in user.map.xml.
Merge changes from github.
Try to fix myinfo page error in deployment env by changing username to userName in PersonalCenterController.java.
Fix myinfo page error.
Merge b8e3014104af2e14406bd659c18ad8adf1de009a from Github.
Fix incorrect parameter name username to userName in user.map.xml.
Add questions to questionnaire.jsp page.
add load and retrieve applicants list in admin personal center
1.add load and retrieve applicants in admin personal center

2.Merge branch 'master' of https://github.com/prod-dev/sannong

Conflicts:
	src/main/resources/user.map.xml
	src/main/webapp/content/views/applicants.jsp
Made UI change for myinfo.jsp and forgotpassword.jsp.
Add footer for pages and fix db connection parameter issue.
fix update user info problem
Add cities table and records.
1.questionnaire answer presentation
2.split questionnaire page
questionnaire answers presentation in admin personal center
delete alert()
Add myaccount for centralizing management of myinfo, mypassword, myapplication and applicants.