Omeka 2.x compatibility
fixes syntax error that occurs in some environments
Merge remote-tracking branch 'upstream/master'

Conflicts:
	curatescape/common/footer.php
	curatescape/common/header.php
	curatescape/config.ini
	curatescape/contribution/contribution/admin-email.php
	curatescape/contribution/contribution/contribute.php
	curatescape/contribution/contribution/contributor-email.php
	curatescape/contribution/contribution/terms.php
	curatescape/contribution/contribution/thankyou.php
	curatescape/custom.php
	curatescape/error/403.php
	curatescape/error/404.php
	curatescape/index.php
	curatescape/items/browse.php
	curatescape/items/show.php
	curatescape/items/tags.php
	curatescape/tour-builder/tours/browse.php
	curatescape/tour-builder/tours/show.php
merge upstream
Fix Omeka 2.x compatibility