Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/mygdx/game/Dice.java
	core/src/com/mygdx/game/SevenDungeons.java