Merge remote-tracking branch 'origin/master' into experiment_design

Conflicts:
	proj.win32/MyFirstGame.sdf
Merge remote-tracking branch 'origin/experiment_design'

Conflicts:
	proj.win32/MyFirstGame.sdf