Merge remote-tracking branch 'remotes/origin/develop' into portal-update

# Conflicts:

#	package.json
#	src/app/app.module.ts
#	src/app/shared/components/contact/contact.component.html