Use caption in Geom retrieval
Use Names instead of captions
Merge branch 'fixes' into from-westpic

Conflicts:
	src/fr/solap4py/core/Metadata.java