first again working version of gamestate
switch to template based state
countless continues to fsm and gamestate
alter directory structure
readded keycallback, some restructuring
merge with master
accidentially renamed FightState
merge with master
fix some windows build errors due to include order (glfw needs windows.h included first). fix EyeSide default in scene
Substate -> SubState
Merge branch 'master' of https://github.com/voxelinc/voxellancer into fsm_and_gamestate

Conflicts:
	src/camera/cameradolly.cpp
	src/display/monoview.cpp
	src/display/scene.h
	src/display/stereoview.cpp
	src/display/stereovieweye.cpp
	src/display/viewer.cpp
	src/display/viewer.h
	src/etc/hmd/hmdmanager.cpp
	src/etc/hmd/hmdmanager.h
	src/game.cpp
	src/game.h
	src/gamestate/gameplay/gameplayscene.cpp
	src/gamestate/gameplay/gameplayscene.h
	src/gamestate/gameplay/running/gameplayrunninginput.cpp
	src/gamestate/gameplay/running/gameplayrunninginput.h
	src/main.cpp
	src/player.cpp
	src/player.h
	src/scenarios/basescenario.cpp
	src/scenarios/battlescenario.cpp
	src/skybox.cpp
	src/skybox.h
	src/voxel/voxelrenderer.cpp
	src/voxel/voxelrenderer.h
fix merge
some fixes
remove cout
add triggerable, keytrigger
statemachine: fixed deep transitions
fixed docu
ingame->gameplay
fix macro redefinition error
merge with master