Merge pull request #2 from claudius108/master

Mavenised the build
bugfixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.project
Merge pull request #3 from ChiSamurai/master

bugfixes