Fixed bug in User#new
Merge branch 'location'