wip (features)
wip features
Merge branch 'master' of https://github.com/evandor/skysail.git

Conflicts:
	skysail.server/etc/testrun.log