ira
test
hbdvb
Merge branch 'master' of https://github.com/caliber01/QR-Map.git

Conflicts:
	QR-Map/bin/jarlist.cache
	QR-Map/project.properties
Merge branch 'master' of https://github.com/caliber01/QR-Map.git
ff
db classes
Merge branch 'master' of https://github.com/caliber01/QR-Map.git

Conflicts:
	QR-Map/bin/R.txt
	QR-Map/gen/android/support/v7/cardview/R.java