Merge der wsbuild.xml
Merge branch 'master' of https://github.com/NielsGPunkt/flaming-hipster

Conflicts:
	cyctomasz/wsbuild.xml