tendu no longer used directly in screens
gameid no longer used in shapesgamecontroller.
Merge branch 'final_iteration_finally' of
https://github.com/tortal/IT2-LP1-Tendu.git into final_iteration_finally

Conflicts:
	Tendu/src/it/chalmers/tendu/screen/NumberGameScreen.java