修复bug
Merge branch 'master' of https://github.com/zzjove/MOMA

Conflicts:
	MOMA/src/java/com/managedbean/moma/WelcomeBean.java
	MOMA/web/userInfoCompletion.xhtml