Merge remote-tracking branch 'upstream/master' into feat/navigation-superstructure

# Conflicts:
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/common/common.module.ts
#	src/app/modules/channels/channel.component.spec.ts
#	src/app/modules/groups/sidebar-markers/sidebar-markers.component.ts
#	src/app/modules/newsfeed/newsfeed.component.ts