wip
Merge branch 'master' of git@github.com:evandor/skysail-server-ext.git

Conflicts:
	skysail.server.ext.osgimonitor/.project