All the latest behaviour and fixes
Merge branch 'master' of https://github.com/melak47/Fishy

Conflicts:
	Fishy/src/GUI/Screens/GameScreen.cpp