Aid in theme duplications
Option order
Fix #798
Dutch translation
Merge remote-tracking branch 'origin/master' into fixing-quotes

Conflicts:
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.mo
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.po