refactored databasehelper to lower number of database queries
added lookupUpc to DatabaseHelper. Implementation in AddItemActivity to
be done later.
Merge branch 'master' into database

Conflicts:
	android/src/com/aj3/kiss/DatabaseHelper.java
fixed typo
fixed bad sql query
If the item already exists, look up UPC from item table, not from UPC
API
fixed upc lookup bug
Merge branch 'master' into database
Fix some bugs.
Merge pull request #38 from jsjones27/database

UPC lookup in local database
Merge branch 'master' into gl_generate