FIX: location label does not show up
Merge remote-tracking branch 'origin'
user login under development.
Merge remote-tracking branch 'origin/master'