make locations work with users
Merge pull request #3 from AbbyBiying/user_location

User related location