Merge branch 'master' into login
static fil from local
nav
Merge branch 'login' into server