http://www.zenphoto.org/support/topic.php?id=39678
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/template-functions.php

	modified:   zp-core/reconfigure.php