Merge remote-tracking branch 'origin/master'

Conflicts:
	Commando/Commando.csproj
	Commando/Scripts/_references.js
	Commando/Scripts/game.js
	Commando/Scripts/game.js.map
	Commando/Scripts/game.ts
	Commando/index.html

Added platform
Fixed changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Commando/Commando.csproj
	Commando/Scripts/_references.js
	Commando/Scripts/game.js
	Commando/Scripts/game.js.map
	Commando/Scripts/game.ts
	Commando/index.html