add user, combo user report
Merge branch 'master' of https://github.com/Alivebox/AliveTracker2.0