Merge remote-tracking branch 'origin/master'

Conflicts:
	war.sdf
	war/Debug/CL.read.1.tlog
	war/Debug/CL.write.1.tlog
	war/Debug/game.obj
	war/Debug/link.read.1.tlog
	war/Debug/player.obj
	war/Debug/vc110.idb
	war/Debug/vc110.pdb
	war/Debug/war.log
	war/Debug/war.obj