New FSM
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project1/LINUX_OR_MINGW/scene-start.cpp