Mantis Ticket 0005615 Changed "Site Settings" to "Property Search Settings"
Mantis Ticket 5615 - ticket changes reverted
Mantis Ticket 5615 - change title to Property & Search Settings
Merge remote-tracking branch 'remotes/origin/2014.03.25'

Conflicts:
	admin.php
	setup-sitesettings.php