minor modification
Merge branch 'master' into user
user login and basic nav