Fixed nextBlock in game. Added setPosition in Block-class
Merge branch 'develop' of https://github.com/linlind/Shotris into develop

Conflicts:
	Shotris/src/graphix/drawing/GameSideBarCanvas.java