resolved pom dependencies on motech
Merge branch 'master' of github.com:ICT4H/atomfeed

Conflicts:
	motech-atomfeed-bundle/pom.xml
	motech-atomfeed-client/pom.xml
	motech-atomfeed-server/pom.xml
	pom.xml