增加personalPage编辑个人资料
没有完成的brochure部分。。
Merge branch 'master' of github.com:zzjove/MOMA

Conflicts:
	MOMA/web/newBrochure.xhtml
just made a mistake..
brochure...to be continued..
增加Friends.xhtml

welcome.xhtml增加了水印
修改BrochureBean
Merge branch 'test2'

Conflicts:
	MOMA/nbproject/project.properties
	MOMA/web/PersonalSpace.xhtml
	MOMA/web/welcome.xhtml
修改之前merge小问题
Merge remote-tracking branch 'origin/elena'

Conflicts:
	MOMA/src/java/com/managedbean/moma/WelcomeBean.java
	MOMA/web/userInfoCompletion.xhtml
	MOMA/web/welcome.xhtml
修改了一下merge之后的bug
修复bug
Merge branch 'master' of https://github.com/zzjove/MOMA

Conflicts:
	MOMA/src/java/com/managedbean/moma/WelcomeBean.java
	MOMA/web/userInfoCompletion.xhtml
orig
修复merge bug
Merge branch 'master' of github.com:zzjove/MOMA
首页样式
Merge branch 'zzjove' of github.com:zzjove/MOMA into elena

Conflicts:
	MOMA/nbproject/project.properties
	MOMA/web/newBrochure.xhtml