prep for merge conflict
Merge branch 'master' of https://github.com/JavierJames/SmartPhoneSensing
Merge branch 'master' of https://github.com/JavierJames/SmartPhoneSensing
for localization, scan button enables and disables using thread
fixed merged conflicts