Changed locale strings
Merge branch 'master' into test
Add further testing. Add helper methods to Location and User