null
Merge branch 'master' of github.com:zzjove/MOMA

Conflicts:
	MOMA/nbproject/project.properties
验证码bean，发表日志，浏览传相片界面
Merge remote-tracking branch 'origin/elena'

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