added SettingsActivity
Merge branch 'master' of https://github.com/r3dDoX/fliBeacons
added LocationService (but it does not send anything yet)
Merge remote-tracking branch 'origin/master'