toXML added
Merge branch 'master' of https://github.com/marcokeur/drw

Conflicts:
	controller/webservice/server.py
	core/devicemanager.py