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

Conflicts:
	skysail.server.um/src/main/resources/META-INF/persistence.xml