Merge pull request #909 from colemanw/search

CRM/ACL/Form/ACL.php

CRM/ACL/Page/ACL.php

CRM/Activity/BAO/Activity.php

CRM/Activity/BAO/ActivityAssignment.php

CRM/Activity/BAO/ActivityTarget.php

CRM/Activity/BAO/Query.php

CRM/Activity/Form/Activity.php

CRM/Activity/Form/Task/PickOption.php

CRM/Activity/Import/Form/MapField.php

CRM/Activity/Page/AJAX.php

CRM/Activity/Selector/Search.php

CRM/Admin/Form/MailSettings.php

CRM/Admin/Form/Mapping.php

CRM/Admin/Form/OptionValue.php

CRM/Admin/Form/Options.php

CRM/Admin/Form/PaymentProcessor.php

CRM/Admin/Form/Preferences/Display.php

CRM/Admin/Page/MailSettings.php

CRM/Batch/BAO/Batch.php

CRM/Batch/Form/Batch.php