+treeview muster
Merge branch 'mbaeuml'

Conflicts:
	THWInventory/AndroidManifest.xml
	THWInventory/bin/AndroidManifest.xml
	THWInventory/bin/THWInventory.apk
	THWInventory/bin/classes.dex
	THWInventory/bin/resources.ap_
	THWInventory/res/layout/activity_main.xml
	THWInventory/res/values/styles.xml