Merge branch 'master' into 460-coll-pages

src/app/+login-page/login-page.component.html

src/app/core/auth/auth.service.spec.ts

src/app/core/auth/auth.service.ts

src/app/core/auth/server-auth.service.ts

src/app/shared/auth-nav-menu/auth-nav-menu.component.html

src/app/shared/log-in/log-in.component.spec.ts

src/app/shared/log-in/log-in.component.ts

src/app/shared/testing/auth-service-stub.ts

src/app/shared/testing/route-service-stub.ts

src/modules/app/server-app.module.ts