jgke really wanted these javadocs
package-infos
extensions use parents data
Merge branch 'master' of github.com:paivola/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/core/Model.java
fix for maven issues with main class
Merge pull request #1 from Jgke/master

fix for maven issues with main class
The config file can now be passed to the SettingsParser
Merge pull request #2 from kivibot/master

The config file can now be passed to the SettingsParser
New setting classes
additional constructors for Setting subclasses
Merge pull request #3 from Jgke/master

additional constructors for Setting subclasses
fixes for previous commit
Merge pull request #4 from Jgke/master

fixed build failures after #3
work on websockets starts
models now have a sender, closes #5
Art of lacking a client
fixed some websocket errors
Latitude and longitude in models
better JSON formatting
getting the "settings" is much more "fulfilling"