add/edit of users and locations
Merge branch 'master' of github.com:Fuzati/voloforce