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

Conflicts:
	cocoon/sitemap.xmap
reverting to master
Merge branch 'master' into egypt
began incorporating alternative language labels; removed search_segments.xsl, incorporated functions.xsl
changed collection back to numishare