upc search
Merge branch 'master' into timor
upc scan
upc scan works
Merge remote-tracking branch 'origin/master' into timor