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

Conflicts:
	zp-core/admin-edit.php

	modified:   zp-core/admin-edit.php
Add Windows locale reporting
Add cookies to debug tab
Merge pull request #42 from sbillard/master

todays updates