Bug Fixed in JavaDoc and TestCases
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapFilesTest/.DS_Store
	MapFilesTest/._.DS_Store
	build/classes/tdgame/controller/MapBoxController.class
	build/classes/tdgame/view/MapBoxView.class
	build/classes/tdgame/view/MapCreationView.class
	build/test/classes/TDSuite.class
	resources/Thumbs.db
	src/tdgame/controller/MapValidation.java
	src/tdgame/controller/ShopController.java
	src/tdgame/model/CellContainerModel.java
	src/tdgame/model/configModel.java
	src/tdgame/view/GridCellView.java
	src/tdgame/view/ShopView.java
	test/TDSuite.java