no message
Merge branch 'master' of https://github.com/cmitz/Shoque

Conflicts:
	bin/classes/com/saxion/shoque/playground/model/Game.class
	bin/classes/com/saxion/shoque/playground/model/GameBoard.class
	bin/classes/com/saxion/shoque/playground/view/GameBoardView$TileImage.class
	bin/classes/com/saxion/shoque/playground/view/GameBoardView.class