update
update
Merge branch 'master' of github.com:mooing/wss

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/main/webapp/WEB-INF/views/module/moduleList.html