Merge origin/master

Conflicts:
	neuroph-2.9/ImageRec/pom.xml