fix merge conflicts with dev

package-lock.json

src/app/app-routing.module.ts

src/app/app.module.ts

src/app/core/address.model.ts

src/app/core/auth/adapters.ts

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

src/app/core/auth/models.ts

src/app/core/auth/token.interceptor.ts

src/app/login/login.component.html

src/app/login/login.component.scss

src/app/login/login.component.ts

src/app/projects/core/participation.service.ts

...app/projects/register-wizard/register-wizard.component.ts

src/app/shared/blue_navbar/blue_navbar.component.html

src/app/shared/blue_navbar/blue_navbar.component.scss

src/app/shared/blue_navbar/blue_navbar.component.ts

src/app/shared/form-page/form-page.component.html

src/app/shared/form-page/form-page.component.scss

src/app/shared/form-page/form-page.component.ts

src/app/shared/index.ts