Test
Merge branch 'master' of https://github.com/dnldnz/thermostatHti.git

Conflicts:
	bin/R.txt
	bin/classes/com/example/thermostathti/BuildConfig.class
	bin/classes/com/example/thermostathti/FullscreenActivity.class