Added Xml-Reader
Merge remote-tracking branch 'origin/master' into feature_xml_read

Conflicts:
	src/com/example/modernhome/MainActivity.java
Fixed merge bug
Test version
Added feature reading config from xml