Merge branch 'master' of github.com:boyuan459/conference

Conflicts:
	nbproject/project.properties
	src/cms/gui/CmsGUI.java