committing egypt branch sitemap
Merge branch 'master' into egypt
Merge branch 'master' into egypt

Conflicts:
	cocoon/sitemap.xmap
reverting to master
added uva collection-name
updated authentication XPL for uva
Merge branch 'master' into uva
fixed glitch in getting gml:pos for mint; added support for reading RDF from nomisma for findspotDesc
fixed glitches in coin mapping; fixed minor glitches in indexing; moving away from mapping findspots from findspots.kml in object page; fixed glitch in displaying typeDesc when the typeDesc points to OCRE
moved back to numishare collection
updated electrum sitemap
changed sitemap back
added electrum group
Merge branch 'master' into egypt
began incorporating alternative language labels; removed search_segments.xsl, incorporated functions.xsl
changed collection back to numishare
Merge branch 'master' into chrr