small changes to Jarvis, Jarvis should be fully functional
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/karlskrone/jarvis/fullplugintesting/Main.java