inf_dungeon merge
Merge branch 'master' of https://github.com/Arkoniak/lua-state-machine

Conflicts:
	examples/inf_dungeon.lua
Final release of example battle.lua