lots of things are starting to work
fixing tokenQueue and visual token editing
fixing leftovers, then:

Merge branch 'master' of ssh://github.com/mrplants/RoboDog

Conflicts:
	GameMaster.cpp