resolve merge conflicts with dev

README.md

package-lock.json

src/app/app-routing.module.ts

src/app/app.component.css

src/app/app.component.html

src/app/app.component.ts

src/app/app.module.ts

src/app/core/address.model.ts

src/app/core/api.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/core/core.module.ts

src/app/core/document.service.ts

src/app/core/geocoding.service.ts

src/app/core/loader.interceptor.ts

src/app/core/loader.service.ts

src/app/core/resolvers/generic.ts

src/app/core/resolvers/simple.resolver.ts