Temp index.xml missing <metad> tags
fixes issue #505
Fixes Issue #482
Merge branch 'hotfixes'

Conflicts:
	admin/edit.php