Merge branch 'commerce'

Conflicts:
	src/controler/InterfaceControler.java
	src/model/CatanModel.java
	src/model/Player.java