removed a stack trace printout
Merge branch 'dev' of github.com:metacake/core into dev
Merge branch 'dev' of github.com:metacake/core into dev
fixed merge conflicts
added a condition to closing the window in the gamerunner
resolved a small merge conflict with the gamerunner.
merge resolve whacked a change