XML
Merge branch 'master' of github.com:AthomeSolution/Tomat

Conflicts:
	Makefile