修复显示照片的bug
Merge branch 'zzjove' of github.com:zzjove/MOMA into elena

Conflicts:
	MOMA/nbproject/project.properties
	MOMA/web/newBrochure.xhtml
blessingPage, userHomePage, viewPhoto, writeDiary 绑定后台bean
Merge remote-tracking branch 'origin/elena'

Conflicts:
	MOMA/nbproject/build-impl.xml
	MOMA/nbproject/genfiles.properties
	MOMA/nbproject/project.properties
	MOMA/nbproject/project.properties.orig
	MOMA/web/writeDiary.xhtml