Deployment
Merge branch 'master' of github.com:evilcandybag/Stagehand-compound-effect

Conflicts:
	pom.xml