ignores
Merge branch 'master' of https://github.com/AtlasOfLivingAustralia/image-service

Conflicts:
	image-service-grailsPlugins.iml