fix for locations based on users
Merge branch 'master' of https://github.com/clintascencio/WERTY