Fixes bug with canceling out of last menu in battle
Merge branch 'master' into gh-pages