state machine
Merge branch 'master' of github.com:liquidg3/altair

Conflicts:
	core/lib/altair/StateMachine.js