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

Conflicts:
	cnf/build.xml
wip