pom changed
Merge branch 'master' of https://github.com/nodepro/cor-test

Conflicts:
	.svn/wc.db