Changes to the jenkins script trigger via http get
Changes to the jenkins script trigger via http get
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	pom.xml
Changes to the jenkins script trigger via http get