as
sa
Merge remote-tracking branch 'origin/master'

Conflicts:
	SP1Framework-master/SP1Framework/game.cpp