delete obsolete msg
Dutch translation
A few typo's
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.mo
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.po
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.mo
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.po
	zp-core/zp-extensions/zenpage/template-functions.php

	modified:   zp-core/admin-edit.php
cleanuup
flag head