Added a settings button to the main activity
Merge branch 'master' of https://github.com/fishjord/wifi_survey