Merging develop into game/dragonfall to use new features in game