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

Conflicts:
	QR-Map/bin/jarlist.cache
	QR-Map/project.properties