some formatting by netbeans IDE
#435
Merge branch '1.4.5' of https://github.com/zenphoto/zenphoto into 1.4.5

Conflicts:
	zp-core/zp-extensions/contact_form.php

	modified:   zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.po
fix Git client screwup