merge
Merge branch 'master' of https://github.com/Irme/SpaceRushHour

Conflicts:
	RushHourPuzzle/src/is/ru/app/puzzle/BoardDrawableView.java