Tweaks to numberGameScreen
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
EventBus.
weak hash map, with synchronized wrapper
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
testing eventbus
reverting evbus
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
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
Shapes and locks render differently
Diamonds and rhomboids can be rendered.