-
Merge branch 'master' of https://github.com/puniverse/capsule-demo

Conflicts:
	pom.xml