Merge branch 'epic/navigation-93' into feat/navigation-superstructure

# Conflicts:
#	src/app/services/providers.ts
#	src/stylesheets/themes.scss