Merge branch 'master' into Matt-Branch-4

Conflicts:
core/src/Screens/BoardScreen.java
core/src/com/mygdx/game/SevenDungeons.java