Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app/app.module.ts
#	src/app/select-game/select-game.component.html