Need some testing to see if the temperature scale drop downs do in fact work. Will need to add <activity> tags to androidmanifest.xml for my intent.
Merge branch 'master' of https://github.com/lsftw/ThermalCamera

Conflicts:
	res/values/strings.xml