POR-2188 Fixed by avoiding check_markup() on the contacts page. Too many unexpected line-breaking characters from IMS.

git-svn-id: https://gbif-portal.googlecode.com/svn/portal-drupal7/trunk@2949 3650c4fd-ea0f-e2d6-5ead-89630c913e81
Revert menu_import to modified 7.x-1.5 to restore the ability to handle non-drupal-url menu items.

git-svn-id: https://gbif-portal.googlecode.com/svn/portal-drupal7/trunk@2950 3650c4fd-ea0f-e2d6-5ead-89630c913e81
Cleaned up local settings.

git-svn-id: https://gbif-portal.googlecode.com/svn/portal-drupal7/trunk@2951 3650c4fd-ea0f-e2d6-5ead-89630c913e81
Updated menu import and keeping non-drupal-url handling.

git-svn-id: https://gbif-portal.googlecode.com/svn/portal-drupal7/trunk@2952 3650c4fd-ea0f-e2d6-5ead-89630c913e81