SQLite
Merge branch 'master' of https://github.com/ZIPASmart/r3000

Conflicts:
	app/src/main/java/au/net/zipa/r3000/r3000/HeatmapsActivity.java