Merge branch 'master' into newGui

Conflicts:
	src/main/scala/AkkaSobel/Sobel.scala