Added CanPlaySoldier test
Merge branch 'master' of https://github.com/255/catan

Conflicts:
	java/test/shared/model/GameModelFacadeTest.java