Merge branch 'master' of https://github.com/dkadio/thwapp.git

Conflicts:
	THWInventory/AndroidManifest.xml
	THWInventory/bin/AndroidManifest.xml
Merge branch 'mbaeuml'