Formulas and alarms tweaked
Merge branch 'master' of https://github.com/vonbob/Fall_Prevention_2013