Commit for pull
Merge remote-tracking branch 'origin/futurelad' into futurelad

Conflicts:
	Scotlad_Yard/src/com/sirtetris/scotlad_yard/GameMap.java