style fixes and bugs
Merge branch 'master' of https://github.com/Alivebox/AliveTracker2.0