Merge branch 'dev' into #20-Spectator-Client

Conflicts:
src/client/controllers/Client.java
Client and Spectator implementing abstract methods

Just trying to get a compilable commit…