Unknown and unexpected commit, since someone forgot to push. Henrik
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/src/gui/register/Gui.java
	Enduro/src/io/reader/IntervalParser.java
	Enduro/src/test/unit/TestIntervalParser.java
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git
Fixed some of the main jungle, and made the loading of the jarDir work.
Also removed warnings everywhere. Henrik Karl
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git