Joaof dev

Adds location to users. Merge conflicts fixed.