wip
Merge branch 'master' of https://github.com/evandor/skysail

Conflicts:
	derby.log