camera funkt noch nicht
Merge branch 'master' of https://github.com/focusdays/InventarApp.git

Conflicts:
	inventoryApp/AndroidManifest.xml
	inventoryApp/src/com/example/inventoryapp/InventaryListCommodityFragment.java
	inventoryApp/src/com/example/inventoryapp/InventoryListActivity.java
Merge branch 'master' of https://github.com/focusdays/InventarApp.git
Merge branch 'master' of https://github.com/focusdays/InventarApp.git