整理文件夹
修改目录
Merge branch 'master' of github.com:zzjove/MOMA

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