Add semantics3 as a data source
Cherry-pick data from master
Merge branch 'master' into semantic3

Conflicts:
	src/instrumentTest/java/com/selesse/android/winedb/tests/winescraper/impl/UPCDatabaseOrgWineScraperTest.java
	src/instrumentTest/java/com/selesse/android/winedb/tests/winescraper/impl/UPCDatabaseWineScraperTest.java
Tidy up Scrapers
Update Zxing integration
WineDB 1.2.0