Remove expand/collapse links on image edit pages as they are obsolete now
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zp-core/admin-edit.php

	modified:   zp-core/admin-edit.php