Entity changes and main menu
Merge branch 'master' of https://github.com/tonythedemon/PureJava