use latest snapshot of galley and atlas
Merge branch 'master' of github.com:jdcasey/cartographer

Conflicts:
	pom.xml