Added global models, formatting
Merge branch 'master' of github.com:paivola/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/core/Model.java