Corrected GWT module files
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4

Conflicts:
	server/src/main/java/org/activityinfo/core/Core.gwt.xml