email admin and sms on applicationapge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/sannong/presentation/controller/PersonalCenterController.java
	src/main/java/com/sannong/presentation/controller/ProjectApplicationController.java
	src/main/java/com/sannong/service/impl/ProjectServiceImpl.java
	src/main/resources/user.map.xml
	src/main/webapp/content/views/myinfo.jsp
	src/main/webapp/content/views/projectapplication.jsp