Fixed some timing events for on screeen stuff in NumberGameScreen
Changed screen resolution
Updates to TextWidget
minor
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
no progress
ShapeGameModelController changes the "right" objects.
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
move shape to proper pos when sent between devices W.I.P
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git
into Majormerge

Conflicts:
	Tendu/src/it/chalmers/tendu/controllers/ShapeGameModelController.java
The shape should now appear at the proper side of the screen when sent
from a device to another.
Merge branch 'Majormerge' into Sound

Conflicts:
	Tendu/src/it/chalmers/tendu/gamemodel/GameId.java
	Tendu/src/it/chalmers/tendu/screens/NumberGameScreen.java