Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/js/_language.js
	src/js/backend.js
	src/js/objects/ButtonPanel.js
	src/js/objects/Representations/StrikeRepresentation.js
	src/js/objects/buttons/NumberButton.js
	src/js/player.js
	src/js/states/EntryState.js
	src/js/states/PlayerSetupState.js
	src/js/states/Subgame.js
	src/js/states/subgames/BirdheroGame.js
	src/js/utils.js