added motech-atomfeed-server to parent module
Merge branch 'master' of github.com:ICT4H/atomfeed

Conflicts:
	motech-atomfeed-server/pom.xml