deleted comment
Merge branch 'master' into database
does not create duplicate entries in item table
deleted testing code left behind
deleted test code
made item name unique
made category a separate table
database can get an individual list item. used to check if item is
already in the inventory or grocery list
added unit and upc to database
Merge branch 'master' into database
mergini in master
More merging from master and UI_changes, NOTE: THIS CODE DOESNT WORK AND NEEDS FIXING
Tiny fix
returning the category and unit class
Merge pull request #12 from jsjones27/database

Seems good, we need to figure out this problem with new installs/changing the database though.
Removed unused imports
Merge branch 'master' into scaning

Conflicts:
	android/src/com/aj3/kiss/AddItemActivity.java