增加Friends.xhtml

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

Conflicts:
	MOMA/nbproject/project.properties
	MOMA/web/PersonalSpace.xhtml
	MOMA/web/welcome.xhtml