半成品，only for merge
Merge branch 'elena' of https://github.com/zzjove/MOMA into elena

Conflicts:
	MOMA/src/java/com/managedbean/moma/WelcomeBean.java
	MOMA/web/userInfoCompletion.xhtml
Merge branch 'elena' of https://github.com/zzjove/MOMA into elena

Conflicts:
	MOMA/nbproject/project.properties
Merge branch 'elena'

Conflicts:
	MOMA/nbproject/project.properties