Removed unused imports
#117
Fixed indentation in BattleMenu.java
Removed unused variable
Merge branch 'shkesar-dev'
Merge remote-tracking branch 'upstream/master'