Updated scm urls to the github format
Merge branch 'develop' into v2.3.0

Conflicts:
	pom.xml