Get rid of some 'game' cruft that the EM doesn't need.
Merge branch 'master' into libgdx