back to 1.5-SNAPSHOT
Merge branch 'master' of https://github.com/iantestplant/eggplant-plugin

Conflicts:
	pom.xml