removed settings actionbar item in settingsActivity
Merge branch 'master' of https://github.com/camhashemi/beacon