.
Merge branch 'master' of github.com:cnduru/sw7_backend
stuff
Merge branch 'master' of github.com:cnduru/sw7_backend

Conflicts:
	Engine/Engine/XMLbuilder.cs