wsbuild (Andreas)
restart implemented
Merge branch 'master' of https://github.com/adittrich/flaming-hipster

Conflicts:
	cyctomasz/wsbuild.xml