Fix typo
Merge pull request #301 from zenphoto/local-support-branch

Fix typo
fix #305
fix #305
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/template-functions.php

	modified:   themes/zenpage/image.php
Merge branch '1.4.5' of https://github.com/zenphoto/zenphoto into 1.4.5