Merged master into own branch

- after the restructuring of the server


Former-commit-id: 80c50f436f757bb5fe2d7ab5b7e307106d16bece
fixed pom file... apperantly the sonar does not actually parse the pom with properties


Former-commit-id: 97f703c3cb008c82bf8b92d36ad372345a4c13d7
Merge pull request #106 from MartinRogalla/development

fixed pom file... apperantly the sonar does not actually parse the pom with properties

Former-commit-id: c6901a9d13fb54794cc8521b66c9b1b058e12a6c
Merge branch 'master' into Team-2


Former-commit-id: aa1b66f397ef3360f9ca8619f33af739a7d269b2
Merge branch 'master' into Team-2_Sprint3_BotStoreMVC


Former-commit-id: 0c52e590b0cbc57049fe9883dd8da45ad1a74709
Merge branch 'master' into ScenarioEditor


Former-commit-id: 5bf77555a2fdd5ed54d263214bca7664a58e1245
Merge branch 'master' into logger


Former-commit-id: 424350fe2372e8b2bbda335c018a6e482cd801d2
Edited the way blockades were drawn

- removed the logs for better overview


Former-commit-id: 2af8e4f1afe0ac0c3435828b9144934b423d976e
Merge branch 'master' into ScenarioEditor_ShorterMethods

Conflicts:
	bw4t/bw4t-core/src/main/java/nl/tudelft/bw4t/scenariogui/BotConfig.java

Former-commit-id: e98c6d9b20e6cef35fdf14f0a1d5cbd5569ddc16
Merge branch 'master' into Team-2-randomizeMap

Conflicts:
	bw4t/bw4t-server/src/test/java/nl/tudelft/bw4t/robots/DefaultEntityFactoryTestSuite.java

Former-commit-id: 720a7758436cb122b5249a2ec5dd4b6a45d9dfdc
Merge branch 'master' into ScenarioEditor_addGoalFileColumn

Conflicts:
	bw4t/bw4t-scenario-editor/src/main/java/nl/tudelft/bw4t/scenariogui/controllers/epartner/EpartnerSaveButton.java
	bw4t/bw4t-scenario-editor/src/main/java/nl/tudelft/bw4t/scenariogui/editor/gui/EntityPanel.java

Former-commit-id: 25b3afcff89f1e723e2147fce6c41eeba8f94e6a
Merge branch 'master' into ScenarioEditor_TableUpdate


Former-commit-id: 22d49cff3d875d7d73780582306137161fba83ff
Merge branch 'master' into development_ClientTesting


Former-commit-id: d809c2a89f14f2cb12ab80a257a2e9073763feb7
ChargingZone & Blockade

ChargingZones:
- recharge robot when robot is in this zone
- has the UI action: "go recharge"
- are green

Blockades:
- block robots' path
- have no UI actions
- are brown

Former-commit-id: 236624d2438689a5bb04fb82bbd3f20b4cfe31e3
Restructured the whole Map Editor. Still needs to become fully MVC


Former-commit-id: 941df265ee02fb9b2d46533d8af2e0925a23f973
Restructured the whole Map Editor. Still needs to become fully MVC


Former-commit-id: 8fd979a52b253a0dd398dc55a289d14dba62fa0a
Merge branch 'EnvironmentStore' of github.com:MartinRogalla/BW4T into EnvironmentStore


Former-commit-id: cc5ba147ae236c36293485fae939886fe75df7ee
Also needs new Map and Room, added now


Former-commit-id: 5018c105d43de6ddb55d071b1871b4c9cc4e3689
DefaultEntityFactoryTest

usage of PowerMock successful!
can mock a final class
can use staticMock


Former-commit-id: c2d574e189732bc4005fd3bf04bee86421d76ecd
Merge pull request #107 from MartinRogalla/Team-2

good job on the static mocking, please write a short wiki entry on how to do it! Thanks

Former-commit-id: 64eda4611eb67868aa7dfcc89639fa20008b84d8