init& finish scan strategy and activity

clean up code
clean up code

Clean up
Merge branch 'master' of https://github.com/Icetraveller/Arrow-Battery-Test-App

update