commit
Merge remote-tracking branch 'origin/dev3'

Conflicts:
	src/test/TestSWAP.groovy
Merge branch 'master' into development4