addToGrocery and addToInventory now use the same helper function
Merge pull request #26 from jsjones27/database

addToGrocery and addToInventory now use the same helper function
Merge branch 'master' into scaning
direct user to install free barcode scanner by default, not paid one
fixed xml that was broken during merge
Merge branch 'scaning' of https://github.com/jsjones27/kiss into scaning

Conflicts:
	android/res/layout/activity_add_item.xml
	android/src/com/aj3/kiss/AddItemActivity.java