General Styling issues fixedgit add -A
Merge fixed
Merge branch 'master' of https://github.com/Alivebox/AliveTracker2.0