Merge remote-tracking branch 'origin/master' into refactoring
Merge branch 'refactoring' of github.com:GeoKnow/GeoKnowGeneratorUI into refactoring

Conflicts:
	src/main/webapp/WEB-INF/web.xml