Fixed Java 7 error
Merge branch 'feature/server_game_logic' into develop