More test of config and stations for story 21. Henrik
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/config.properties
	Enduro/src/main/ResultCompilerMain.java
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git