div aenderung
init folder and default.csv
code veschoenert
Merge branch 'mbaeuml'

Conflicts:
	THWInventory/bin/THWInventory.apk
	THWInventory/bin/classes.dex
	THWInventory/bin/resources.ap_
	THWInventory/res/values/strings.xml