diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index 6360f38..3b8547c 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -2971,7 +2971,7 @@
 ->values(array(
   'field_name' => 'field_test_datestamp',
   'type_name' => 'story',
-  'weight' => '11',
+  'weight' => '12',
   'label' => 'Date Stamp Field',
   'widget_type' => 'date_select',
   'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
@@ -2983,7 +2983,7 @@
 ->values(array(
   'field_name' => 'field_test_datetime',
   'type_name' => 'story',
-  'weight' => '12',
+  'weight' => '13',
   'label' => 'Datetime Field',
   'widget_type' => 'date_select',
   'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
@@ -2995,7 +2995,7 @@
 ->values(array(
   'field_name' => 'field_test_decimal_radio_buttons',
   'type_name' => 'story',
-  'weight' => '14',
+  'weight' => '15',
   'label' => 'Decimal Radio Buttons Field',
   'widget_type' => 'optionwidgets_buttons',
   'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";s:0:"";}}s:17:"default_value_php";N;}',
@@ -3019,7 +3019,7 @@
 ->values(array(
   'field_name' => 'field_test_exclude_unset',
   'type_name' => 'story',
-  'weight' => '0',
+  'weight' => '-1',
   'label' => 'Text Field',
   'widget_type' => 'text_textfield',
   'widget_settings' => 'a:4:{s:4:"rows";i:5;s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:22:"text for default value";s:14:"_error_element";s:42:"default_value_widget][field_test][0][value";}}s:17:"default_value_php";N;}',
@@ -3043,7 +3043,7 @@
 ->values(array(
   'field_name' => 'field_test_float_single_checkbox',
   'type_name' => 'story',
-  'weight' => '15',
+  'weight' => '16',
   'label' => 'Float Single Checkbox Field',
   'widget_type' => 'optionwidgets_onoff',
   'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";N;}}s:17:"default_value_php";N;}',
@@ -3103,7 +3103,7 @@
 ->values(array(
   'field_name' => 'field_test_integer_selectlist',
   'type_name' => 'story',
-  'weight' => '16',
+  'weight' => '17',
   'label' => 'Integer Select List Field',
   'widget_type' => 'optionwidgets_select',
   'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";s:0:"";}}s:17:"default_value_php";N;}',
@@ -3127,7 +3127,7 @@
 ->values(array(
   'field_name' => 'field_test_phone',
   'type_name' => 'story',
-  'weight' => '13',
+  'weight' => '14',
   'label' => 'Phone Field',
   'widget_type' => 'phone_textfield',
   'widget_settings' => 'a:3:{s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:48:"default_value_widget][field_test_phone][0][value";}}s:17:"default_value_php";N;}',
@@ -3139,7 +3139,7 @@
 ->values(array(
   'field_name' => 'field_test_text_single_checkbox',
   'type_name' => 'story',
-  'weight' => '17',
+  'weight' => '18',
   'label' => 'Text Single Checkbox Field',
   'widget_type' => 'optionwidgets_onoff',
   'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";s:1:"a";}}s:17:"default_value_php";N;}',
@@ -3187,7 +3187,7 @@
 ->values(array(
   'field_name' => 'field_test_two',
   'type_name' => 'story',
-  'weight' => '1',
+  'weight' => '0',
   'label' => 'Integer Field',
   'widget_type' => 'number',
   'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:46:"default_value_widget][field_test_two][0][value";}}s:17:"default_value_php";N;}',
@@ -10873,21 +10873,21 @@
 ))
 ->values(array(
   'lid' => '342',
-  'location' => 'modules/nodereference/nodereference.module:60',
+  'location' => 'modules/nodereference/nodereference.module:71',
   'textgroup' => 'default',
   'source' => 'Node reference',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '343',
-  'location' => 'modules/nodereference/nodereference.module:61',
+  'location' => 'modules/nodereference/nodereference.module:72',
   'textgroup' => 'default',
   'source' => 'Store the ID of a related node as an integer value.',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '344',
-  'location' => 'modules/nodereference/nodereference.module:75',
+  'location' => 'modules/nodereference/nodereference.module:90',
   'textgroup' => 'default',
   'source' => 'Content types that can be referenced',
   'version' => 'none',
@@ -10901,21 +10901,21 @@
 ))
 ->values(array(
   'lid' => '346',
-  'location' => 'modules/nodereference/nodereference.module:90,  modules/userreference/userreference.module:87',
+  'location' => 'modules/nodereference/nodereference.module:101',
   'textgroup' => 'default',
   'source' => 'Existing Views',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '347',
-  'location' => 'modules/nodereference/nodereference.module:97',
+  'location' => 'modules/nodereference/nodereference.module:108',
   'textgroup' => 'default',
   'source' => 'Advanced - Nodes that can be referenced (View)',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '348',
-  'location' => 'modules/nodereference/nodereference.module:104',
+  'location' => 'modules/nodereference/nodereference.module:114',
   'textgroup' => 'default',
   'source' => 'View used to select the nodes',
   'version' => 'none',
@@ -10936,14 +10936,14 @@
 ))
 ->values(array(
   'lid' => '351',
-  'location' => 'modules/nodereference/nodereference.module:112,  modules/userreference/userreference.module:109',
+  'location' => 'modules/nodereference/nodereference.module:121',
   'textgroup' => 'default',
   'source' => 'View arguments',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '352',
-  'location' => 'modules/nodereference/nodereference.module:115,  modules/userreference/userreference.module:112',
+  'location' => 'modules/nodereference/nodereference.module:124',
   'textgroup' => 'default',
   'source' => 'Provide a comma separated list of arguments to pass to the view.',
   'version' => 'none',
@@ -10971,14 +10971,14 @@
 ))
 ->values(array(
   'lid' => '356',
-  'location' => 'modules/nodereference/nodereference.module:242',
+  'location' => 'modules/nodereference/nodereference.module:200',
   'textgroup' => 'default',
   'source' => 'Title (link)',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '357',
-  'location' => 'modules/nodereference/nodereference.module:247',
+  'location' => 'modules/nodereference/nodereference.module:205',
   'textgroup' => 'default',
   'source' => 'Title (no link)',
   'version' => 'none',
@@ -11559,28 +11559,28 @@
 ))
 ->values(array(
   'lid' => '440',
-  'location' => 'modules/userreference/userreference.module:67',
+  'location' => 'modules/userreference/userreference.module:71',
   'textgroup' => 'default',
   'source' => 'User roles that can be referenced',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '441',
-  'location' => 'modules/userreference/userreference.module:73',
+  'location' => 'modules/userreference/userreference.module:77',
   'textgroup' => 'default',
   'source' => 'User status that can be referenced',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '442',
-  'location' => 'modules/userreference/userreference.module:75',
+  'location' => 'modules/userreference/userreference.module:79',
   'textgroup' => 'default',
   'source' => 'Active',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '443',
-  'location' => 'modules/userreference/userreference.module:75',
+  'location' => 'modules/userreference/userreference.module:79',
   'textgroup' => 'default',
   'source' => 'Blocked',
   'version' => 'none',
@@ -11636,14 +11636,14 @@
 ))
 ->values(array(
   'lid' => '451',
-  'location' => 'modules/userreference/userreference.module:357',
+  'location' => 'modules/userreference/userreference.module:253',
   'textgroup' => 'default',
   'source' => 'Reverse link',
   'version' => 'none',
 ))
 ->values(array(
   'lid' => '452',
-  'location' => 'modules/userreference/userreference.module:359',
+  'location' => 'modules/userreference/userreference.module:257',
   'textgroup' => 'default',
   'source' => 'If selected, a reverse link back to the referencing node will displayed on the referenced user record.',
   'version' => 'none',
@@ -11657,7 +11657,7 @@
 ))
 ->values(array(
   'lid' => '454',
-  'location' => 'modules/userreference/userreference.module:887',
+  'location' => 'modules/userreference/userreference.module:586',
   'textgroup' => 'default',
   'source' => 'Related content',
   'version' => 'none',
@@ -12005,6 +12005,76 @@
   'source' => 'Changes made in this table will not be saved until the form is submitted.',
   'version' => 'none',
 ))
+->values(array(
+  'lid' => '504',
+  'location' => 'modules/nodereference/nodereference.module:117',
+  'textgroup' => 'default',
+  'source' => "Choose the \"Views module\" view that selects the nodes that can be referenced.<br />Note:<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the \"Content types\" settings above. Use the view's \"filters\" section instead.</li><li>Use the view's \"fields\" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view's \"sort criteria\" section to determine the order in which candidate nodes will be displayed.</li></ul>",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '505',
+  'location' => 'modules/nodereference/nodereference.module:175',
+  'textgroup' => 'default',
+  'source' => "%name: This post can't be referenced.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '506',
+  'location' => 'modules/nodereference/nodereference.module:518',
+  'textgroup' => 'default',
+  'source' => '%name: Title mismatch. Please check your selection.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '507',
+  'location' => 'modules/userreference/userreference.module:122',
+  'textgroup' => 'default',
+  'source' => '%name: Invalid user.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '508',
+  'location' => 'modules/userreference/userreference.module:255',
+  'textgroup' => 'default',
+  'source' => 'No',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '509',
+  'location' => 'modules/userreference/userreference.module:255',
+  'textgroup' => 'default',
+  'source' => 'Yes',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '510',
+  'location' => 'misc/tableselect.js',
+  'textgroup' => 'default',
+  'source' => 'Select all rows in this table',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '511',
+  'location' => 'misc/tableselect.js',
+  'textgroup' => 'default',
+  'source' => 'Deselect all rows in this table',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '512',
+  'location' => 'misc/teaser.js',
+  'textgroup' => 'default',
+  'source' => 'Split summary at cursor',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '513',
+  'location' => 'misc/teaser.js',
+  'textgroup' => 'default',
+  'source' => 'Join summary',
+  'version' => 'none',
+))
 ->execute();
 
 $connection->schema()->createTable('locales_target', array(
@@ -15545,6 +15615,48 @@
   'plid' => '0',
   'plural' => '0',
 ))
+->values(array(
+  'lid' => '504',
+  'translation' => "Choisissez la vue du module Views qui sélectionne les nœuds pouvant être référencés.<br />Notez que :<ul><li>seules les vues présentant des champs fonctionneront dans ce cadre </li><li>ceci effacera les paramètres de \"Types de contenus\" figurant ci-dessus. Utilisez à la place la section \"filtres\" de la vue ;</li><li>utilisez la section \"champs\" de la vue pour afficher des informations supplémentaires sur les nœuds candidats dans le formulaire de création/édition de nœud ;</li><li>utilisez la section \"critère de tri\" de la vue pour déterminer l'ordre d'affichage des nœuds candidats.</li></ul>",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+))
+->values(array(
+  'lid' => '505',
+  'translation' => "Champ '%name' : cette publication ne peut être référencée.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+))
+->values(array(
+  'lid' => '506',
+  'translation' => "Champ '%name' : incohérence au niveau du titre. Merci de vérifier votre sélection.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+))
+->values(array(
+  'lid' => '507',
+  'translation' => "Champ '%name' : utilisateur invalide.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+))
+->values(array(
+  'lid' => '508',
+  'translation' => 'Non',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+))
+->values(array(
+  'lid' => '509',
+  'translation' => 'Oui',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+))
 ->execute();
 
 $connection->schema()->createTable('menu_custom', array(
@@ -16685,33 +16797,6 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '171',
-  'plid' => '0',
-  'link_path' => 'user/timezone',
-  'router_path' => 'user/timezone',
-  'link_title' => 'User timezone',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '171',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
   'mlid' => '172',
   'plid' => '0',
   'link_path' => 'user/%',
@@ -18683,33 +18768,6 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '248',
-  'plid' => '186',
-  'link_path' => 'admin/settings/date-time/formats/lookup',
-  'router_path' => 'admin/settings/date-time/formats/lookup',
-  'link_title' => 'Date and time lookup',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '186',
-  'p4' => '248',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
   'mlid' => '249',
   'plid' => '0',
   'link_path' => 'admin/content/node-type/article/delete',
@@ -18980,33 +19038,6 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '259',
-  'plid' => '186',
-  'link_path' => 'admin/settings/date-time/delete/%',
-  'router_path' => 'admin/settings/date-time/delete/%',
-  'link_title' => 'Delete date format type',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:52:"Allow users to delete a configured date format type.";}}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '186',
-  'p4' => '259',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
   'mlid' => '260',
   'plid' => '0',
   'link_path' => 'admin/build/menu-customize/%/delete',
@@ -19277,33 +19308,6 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '272',
-  'plid' => '186',
-  'link_path' => 'admin/settings/date-time/formats/delete/%',
-  'router_path' => 'admin/settings/date-time/formats/delete/%',
-  'link_title' => 'Delete date format',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:47:"Allow users to delete a configured date format.";}}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '186',
-  'p4' => '272',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
   'mlid' => '273',
   'plid' => '197',
   'link_path' => 'admin/build/menu/item/%/delete',
@@ -19412,22 +19416,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '299',
-  'plid' => '0',
-  'link_path' => 'event',
-  'router_path' => 'event',
-  'link_title' => 'Events',
-  'options' => 'a:0:{}',
+  'mlid' => '309',
+  'plid' => '158',
+  'link_path' => 'node/add/story',
+  'router_path' => 'node/add/story',
+  'link_title' => 'Story',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:392:\"A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.\";}}",
   'module' => 'system',
-  'hidden' => '1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '299',
-  'p2' => '0',
+  'p1' => '158',
+  'p2' => '309',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -19439,11 +19443,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '300',
-  'plid' => '299',
-  'link_path' => 'event/dst',
-  'router_path' => 'event/dst',
-  'link_title' => 'Event dst view',
+  'mlid' => '310',
+  'plid' => '157',
+  'link_path' => 'admin/content/node-type/story',
+  'router_path' => 'admin/content/node-type/story',
+  'link_title' => 'Story',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -19451,11 +19455,11 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '299',
-  'p2' => '300',
-  'p3' => '0',
+  'p1' => '144',
+  'p2' => '157',
+  'p3' => '310',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -19466,11 +19470,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '301',
-  'plid' => '299',
-  'link_path' => 'event/ical',
-  'router_path' => 'event/ical',
-  'link_title' => 'Event ical feed',
+  'mlid' => '311',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/delete',
+  'router_path' => 'admin/content/node-type/story/delete',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -19478,10 +19482,10 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '299',
-  'p2' => '301',
+  'p1' => '311',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -19493,22 +19497,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '302',
-  'plid' => '299',
-  'link_path' => 'event/feed',
-  'router_path' => 'event/feed',
-  'link_title' => 'Event rss feed',
+  'mlid' => '350',
+  'plid' => '0',
+  'link_path' => 'aggregator',
+  'router_path' => 'aggregator',
+  'link_title' => 'Feed aggregator',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '5',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '299',
-  'p2' => '302',
+  'p1' => '350',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -19520,22 +19524,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '303',
-  'plid' => '299',
-  'link_path' => 'event/type',
-  'router_path' => 'event/type',
-  'link_title' => 'Filter by content type',
+  'mlid' => '351',
+  'plid' => '350',
+  'link_path' => 'aggregator/categories',
+  'router_path' => 'aggregator/categories',
+  'link_title' => 'Categories',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '299',
-  'p2' => '303',
+  'p1' => '350',
+  'p2' => '351',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -19547,11 +19551,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '304',
-  'plid' => '299',
-  'link_path' => 'event/term',
-  'router_path' => 'event/term',
-  'link_title' => 'Filter by taxonomy',
+  'mlid' => '352',
+  'plid' => '350',
+  'link_path' => 'aggregator/opml',
+  'router_path' => 'aggregator/opml',
+  'link_title' => 'OPML feed',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -19561,8 +19565,8 @@
   'weight' => '0',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '299',
-  'p2' => '304',
+  'p1' => '350',
+  'p2' => '352',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -19574,11 +19578,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '305',
-  'plid' => '0',
-  'link_path' => 'node/%/ical',
-  'router_path' => 'node/%/ical',
-  'link_title' => 'Event ical',
+  'mlid' => '353',
+  'plid' => '350',
+  'link_path' => 'aggregator/rss',
+  'router_path' => 'aggregator/rss',
+  'link_title' => 'RSS feed',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -19586,388 +19590,10 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '305',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '306',
-  'plid' => '167',
-  'link_path' => 'admin/settings/event',
-  'router_path' => 'admin/settings/event',
-  'link_title' => 'Events',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:36:"Set up how your site handles events.";}}',
-  'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '1',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '306',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '307',
-  'plid' => '306',
-  'link_path' => 'admin/settings/event/overview',
-  'router_path' => 'admin/settings/event/overview',
-  'link_title' => 'Event overview',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:50:"Change how event summary information is displayed.";}}',
-  'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '306',
-  'p4' => '307',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '308',
-  'plid' => '306',
-  'link_path' => 'admin/settings/event/timezone',
-  'router_path' => 'admin/settings/event/timezone',
-  'link_title' => 'Timezone handling',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:55:"Change how timezone information is saved and displayed.";}}',
-  'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '306',
-  'p4' => '308',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '309',
-  'plid' => '158',
-  'link_path' => 'node/add/story',
-  'router_path' => 'node/add/story',
-  'link_title' => 'Story',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:392:\"A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.\";}}",
-  'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '158',
-  'p2' => '309',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '310',
-  'plid' => '157',
-  'link_path' => 'admin/content/node-type/story',
-  'router_path' => 'admin/content/node-type/story',
-  'link_title' => 'Story',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '157',
-  'p3' => '310',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '311',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/delete',
-  'router_path' => 'admin/content/node-type/story/delete',
-  'link_title' => 'Delete',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '311',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '328',
-  'plid' => '0',
-  'link_path' => 'filefield/progress',
-  'router_path' => 'filefield/progress',
-  'link_title' => '',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '328',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '329',
-  'plid' => '0',
-  'link_path' => 'filefield/ahah/%/%/%',
-  'router_path' => 'filefield/ahah/%/%/%',
-  'link_title' => '',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '329',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '333',
-  'plid' => '167',
-  'link_path' => 'admin/settings/email',
-  'router_path' => 'admin/settings/email',
-  'link_title' => 'CCK Email Contact Form Settings',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:57:"Administer flood control settings for email contact forms";}}',
-  'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '333',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '334',
-  'plid' => '0',
-  'link_path' => 'email/%/%',
-  'router_path' => 'email/%/%',
-  'link_title' => 'Email Contact Form',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '334',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '350',
-  'plid' => '0',
-  'link_path' => 'aggregator',
-  'router_path' => 'aggregator',
-  'link_title' => 'Feed aggregator',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '1',
-  'expanded' => '0',
-  'weight' => '5',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '350',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '351',
-  'plid' => '350',
-  'link_path' => 'aggregator/categories',
-  'router_path' => 'aggregator/categories',
-  'link_title' => 'Categories',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '1',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '350',
-  'p2' => '351',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '352',
-  'plid' => '350',
-  'link_path' => 'aggregator/opml',
-  'router_path' => 'aggregator/opml',
-  'link_title' => 'OPML feed',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '350',
-  'p2' => '352',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '353',
-  'plid' => '350',
-  'link_path' => 'aggregator/rss',
-  'router_path' => 'aggregator/rss',
-  'link_title' => 'RSS feed',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '350',
-  'p2' => '353',
+  'p1' => '350',
+  'p2' => '353',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -20958,71 +20584,17 @@
   'link_title' => 'URL aliases',
   'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:46:\"Change your site's URL paths by aliasing them.\";}}",
   'module' => 'system',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '166',
-  'p3' => '394',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '395',
-  'plid' => '394',
-  'link_path' => 'admin/build/path/delete',
-  'router_path' => 'admin/build/path/delete',
-  'link_title' => 'Delete alias',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
-  'customized' => '0',
-  'p1' => '144',
-  'p2' => '166',
-  'p3' => '394',
-  'p4' => '395',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '396',
-  'plid' => '394',
-  'link_path' => 'admin/build/path/edit',
-  'router_path' => 'admin/build/path/edit',
-  'link_title' => 'Edit alias',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '144',
   'p2' => '166',
   'p3' => '394',
-  'p4' => '396',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21032,11 +20604,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '397',
-  'plid' => '0',
-  'link_path' => 'system/files/imagecache',
-  'router_path' => 'system/files/imagecache',
-  'link_title' => '',
+  'mlid' => '395',
+  'plid' => '394',
+  'link_path' => 'admin/build/path/delete',
+  'router_path' => 'admin/build/path/delete',
+  'link_title' => 'Delete alias',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -21044,12 +20616,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '397',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '144',
+  'p2' => '166',
+  'p3' => '394',
+  'p4' => '395',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21059,24 +20631,24 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '398',
-  'plid' => '167',
-  'link_path' => 'admin/settings/imageapi',
-  'router_path' => 'admin/settings/imageapi',
-  'link_title' => 'ImageAPI',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:19:"Configure ImageAPI.";}}',
+  'mlid' => '396',
+  'plid' => '394',
+  'link_path' => 'admin/build/path/edit',
+  'router_path' => 'admin/build/path/edit',
+  'link_title' => 'Edit alias',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '144',
-  'p2' => '167',
-  'p3' => '398',
-  'p4' => '0',
+  'p2' => '166',
+  'p3' => '394',
+  'p4' => '396',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21167,33 +20739,6 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '402',
-  'plid' => '0',
-  'link_path' => 'core/modules/simpletest/files/imagecache',
-  'router_path' => 'core/modules/simpletest/files/imagecache',
-  'link_title' => '',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '402',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-))
-->values(array(
-  'menu_name' => 'navigation',
   'mlid' => '403',
   'plid' => '400',
   'link_path' => 'admin/build/translate/delete/%',
@@ -21300,6 +20845,141 @@
   'p9' => '0',
   'updated' => '0',
 ))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '407',
+  'plid' => '0',
+  'link_path' => 'nodereference/autocomplete',
+  'router_path' => 'nodereference/autocomplete',
+  'link_title' => 'Nodereference autocomplete',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '407',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '408',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
+  'link_title' => 'Remove field',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '408',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '409',
+  'plid' => '0',
+  'link_path' => 'userreference/autocomplete',
+  'router_path' => 'userreference/autocomplete',
+  'link_title' => 'Userreference autocomplete',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '409',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '410',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_user_reference/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_user_reference/remove',
+  'link_title' => 'Remove field',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '410',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '411',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_node_reference/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_node_reference/remove',
+  'link_title' => 'Remove field',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '411',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
 ->execute();
 
 $connection->schema()->createTable('menu_router', array(
@@ -24133,6 +23813,50 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
+  'path' => 'admin/content/node-type/story/fields/field_node_reference',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:20:"field_node_reference";}',
+  'fit' => '63',
+  'number_parts' => '6',
+  'tab_parent' => 'admin/content/node-type/story/fields',
+  'tab_root' => 'admin/content/node-type/story',
+  'title' => 'Node reference',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '128',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/cck/includes/content.admin.inc',
+))
+->values(array(
+  'path' => 'admin/content/node-type/story/fields/field_node_reference/remove',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:20:"field_node_reference";}',
+  'fit' => '127',
+  'number_parts' => '7',
+  'tab_parent' => '',
+  'tab_root' => 'admin/content/node-type/story/fields/field_node_reference/remove',
+  'title' => 'Remove field',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '4',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/cck/includes/content.admin.inc',
+))
+->values(array(
   'path' => 'admin/content/node-type/story/fields/field_test',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -24859,17 +24583,61 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
+  'path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:31:"field_test_text_single_checkbox";}',
+  'fit' => '127',
+  'number_parts' => '7',
+  'tab_parent' => '',
+  'tab_root' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
+  'title' => 'Remove field',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '4',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/cck/includes/content.admin.inc',
+))
+->values(array(
+  'path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:32:"field_test_text_single_checkbox2";}',
+  'fit' => '63',
+  'number_parts' => '6',
+  'tab_parent' => 'admin/content/node-type/story/fields',
+  'tab_root' => 'admin/content/node-type/story',
+  'title' => 'Text Single Checkbox Field 2',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '128',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/cck/includes/content.admin.inc',
+))
+->values(array(
+  'path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:31:"field_test_text_single_checkbox";}',
+  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:32:"field_test_text_single_checkbox2";}',
   'fit' => '127',
   'number_parts' => '7',
   'tab_parent' => '',
-  'tab_root' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
+  'tab_root' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
   'title' => 'Remove field',
   'title_callback' => 't',
   'title_arguments' => '',
@@ -24881,18 +24649,18 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2',
+  'path' => 'admin/content/node-type/story/fields/field_test_three',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:32:"field_test_text_single_checkbox2";}',
+  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:16:"field_test_three";}',
   'fit' => '63',
   'number_parts' => '6',
   'tab_parent' => 'admin/content/node-type/story/fields',
   'tab_root' => 'admin/content/node-type/story',
-  'title' => 'Text Single Checkbox Field 2',
+  'title' => 'Decimal Field',
   'title_callback' => 't',
   'title_arguments' => '',
   'type' => '128',
@@ -24903,17 +24671,17 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
+  'path' => 'admin/content/node-type/story/fields/field_test_three/remove',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:32:"field_test_text_single_checkbox2";}',
+  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:16:"field_test_three";}',
   'fit' => '127',
   'number_parts' => '7',
   'tab_parent' => '',
-  'tab_root' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
+  'tab_root' => 'admin/content/node-type/story/fields/field_test_three/remove',
   'title' => 'Remove field',
   'title_callback' => 't',
   'title_arguments' => '',
@@ -24925,18 +24693,18 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/content/node-type/story/fields/field_test_three',
+  'path' => 'admin/content/node-type/story/fields/field_test_two',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:16:"field_test_three";}',
+  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:14:"field_test_two";}',
   'fit' => '63',
   'number_parts' => '6',
   'tab_parent' => 'admin/content/node-type/story/fields',
   'tab_root' => 'admin/content/node-type/story',
-  'title' => 'Decimal Field',
+  'title' => 'Integer Field',
   'title_callback' => 't',
   'title_arguments' => '',
   'type' => '128',
@@ -24947,17 +24715,17 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/content/node-type/story/fields/field_test_three/remove',
+  'path' => 'admin/content/node-type/story/fields/field_test_two/remove',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:16:"field_test_three";}',
+  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:14:"field_test_two";}',
   'fit' => '127',
   'number_parts' => '7',
   'tab_parent' => '',
-  'tab_root' => 'admin/content/node-type/story/fields/field_test_three/remove',
+  'tab_root' => 'admin/content/node-type/story/fields/field_test_two/remove',
   'title' => 'Remove field',
   'title_callback' => 't',
   'title_arguments' => '',
@@ -24969,18 +24737,18 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/content/node-type/story/fields/field_test_two',
+  'path' => 'admin/content/node-type/story/fields/field_user_reference',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:14:"field_test_two";}',
+  'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:5:"story";i:2;s:20:"field_user_reference";}',
   'fit' => '63',
   'number_parts' => '6',
   'tab_parent' => 'admin/content/node-type/story/fields',
   'tab_root' => 'admin/content/node-type/story',
-  'title' => 'Integer Field',
+  'title' => 'User reference',
   'title_callback' => 't',
   'title_arguments' => '',
   'type' => '128',
@@ -24991,17 +24759,17 @@
   'file' => 'sites/all/modules/cck/includes/content.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/content/node-type/story/fields/field_test_two/remove',
+  'path' => 'admin/content/node-type/story/fields/field_user_reference/remove',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:14:"field_test_two";}',
+  'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:5:"story";i:2;s:20:"field_user_reference";}',
   'fit' => '127',
   'number_parts' => '7',
   'tab_parent' => '',
-  'tab_root' => 'admin/content/node-type/story/fields/field_test_two/remove',
+  'tab_root' => 'admin/content/node-type/story/fields/field_user_reference/remove',
   'title' => 'Remove field',
   'title_callback' => 't',
   'title_arguments' => '',
@@ -26487,182 +26255,6 @@
   'file' => 'modules/system/system.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/settings/date-time/configure',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:25:"system_date_time_settings";}',
-  'fit' => '15',
-  'number_parts' => '4',
-  'tab_parent' => 'admin/settings/date-time',
-  'tab_root' => 'admin/settings/date-time',
-  'title' => 'Date and time',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '136',
-  'block_callback' => '',
-  'description' => "Settings for how Drupal displays date and time, as well as the system's default timezone.",
-  'position' => '',
-  'weight' => '0',
-  'file' => 'modules/system/system.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/date-time/delete/%',
-  'load_functions' => 'a:1:{i:4;N;}',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:32:"date_api_delete_format_type_form";i:1;i:4;}',
-  'fit' => '30',
-  'number_parts' => '5',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/date-time/delete/%',
-  'title' => 'Delete date format type',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => 'Allow users to delete a configured date format type.',
-  'position' => '',
-  'weight' => '0',
-  'file' => 'sites/all/modules/date/date_api.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/date-time/formats',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:26:"date_api_date_formats_form";}',
-  'fit' => '15',
-  'number_parts' => '4',
-  'tab_parent' => 'admin/settings/date-time',
-  'tab_root' => 'admin/settings/date-time',
-  'title' => 'Formats',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '128',
-  'block_callback' => '',
-  'description' => 'Allow users to configure date formats',
-  'position' => '',
-  'weight' => '1',
-  'file' => 'sites/all/modules/date/date_api.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/date-time/formats/add',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:30:"date_api_add_date_formats_form";}',
-  'fit' => '31',
-  'number_parts' => '5',
-  'tab_parent' => 'admin/settings/date-time/formats',
-  'tab_root' => 'admin/settings/date-time',
-  'title' => 'Add format',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '128',
-  'block_callback' => '',
-  'description' => 'Allow users to add additional date formats.',
-  'position' => '',
-  'weight' => '3',
-  'file' => 'sites/all/modules/date/date_api.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/date-time/formats/configure',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:26:"date_api_date_formats_form";}',
-  'fit' => '31',
-  'number_parts' => '5',
-  'tab_parent' => 'admin/settings/date-time/formats',
-  'tab_root' => 'admin/settings/date-time',
-  'title' => 'Configure',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '136',
-  'block_callback' => '',
-  'description' => 'Allow users to configure date formats',
-  'position' => '',
-  'weight' => '1',
-  'file' => 'sites/all/modules/date/date_api.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/date-time/formats/custom',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'date_api_configure_custom_date_formats',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '31',
-  'number_parts' => '5',
-  'tab_parent' => 'admin/settings/date-time/formats',
-  'tab_root' => 'admin/settings/date-time',
-  'title' => 'Custom formats',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '128',
-  'block_callback' => '',
-  'description' => 'Allow users to configure custom date formats.',
-  'position' => '',
-  'weight' => '2',
-  'file' => 'sites/all/modules/date/date_api.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/date-time/formats/delete/%',
-  'load_functions' => 'a:1:{i:5;N;}',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:27:"date_api_delete_format_form";i:1;i:5;}',
-  'fit' => '62',
-  'number_parts' => '6',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/date-time/formats/delete/%',
-  'title' => 'Delete date format',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => 'Allow users to delete a configured date format.',
-  'position' => '',
-  'weight' => '0',
-  'file' => 'sites/all/modules/date/date_api.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/date-time/formats/lookup',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'date_api_date_time_lookup',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '31',
-  'number_parts' => '5',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/date-time/formats/lookup',
-  'title' => 'Date and time lookup',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
   'path' => 'admin/settings/date-time/lookup',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -26685,28 +26277,6 @@
   'file' => 'modules/system/system.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/settings/email',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:20:"email_admin_settings";}',
-  'fit' => '7',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/email',
-  'title' => 'CCK Email Contact Form Settings',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '6',
-  'block_callback' => '',
-  'description' => 'Administer flood control settings for email contact forms',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
   'path' => 'admin/settings/error-reporting',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -26729,72 +26299,6 @@
   'file' => 'modules/system/system.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/settings/event',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'system_admin_menu_block_page',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '7',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/event',
-  'title' => 'Events',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '6',
-  'block_callback' => '',
-  'description' => 'Set up how your site handles events.',
-  'position' => '',
-  'weight' => '0',
-  'file' => 'modules/system/system.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/event/overview',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:29:"event_admin_overview_settings";}',
-  'fit' => '15',
-  'number_parts' => '4',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/event/overview',
-  'title' => 'Event overview',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '6',
-  'block_callback' => '',
-  'description' => 'Change how event summary information is displayed.',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'admin/settings/event/timezone',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:29:"event_admin_timezone_settings";}',
-  'fit' => '15',
-  'number_parts' => '4',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/event/timezone',
-  'title' => 'Timezone handling',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '6',
-  'block_callback' => '',
-  'description' => 'Change how timezone information is saved and displayed.',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
   'path' => 'admin/settings/file-system',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -27012,29 +26516,7 @@
   'description' => 'Choose which image toolkit to use if you have installed optional toolkits.',
   'position' => '',
   'weight' => '0',
-  'file' => 'modules/system/system.admin.inc',
-))
-->values(array(
-  'path' => 'admin/settings/imageapi',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:19:"administer imageapi";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:17:"imageapi_settings";}',
-  'fit' => '7',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/imageapi',
-  'title' => 'ImageAPI',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '6',
-  'block_callback' => '',
-  'description' => 'Configure ImageAPI.',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
+  'file' => 'modules/system/system.admin.inc',
 ))
 ->values(array(
   'path' => 'admin/settings/language',
@@ -28181,226 +27663,6 @@
   'file' => 'sites/all/modules/cck/includes/content.node_form.inc',
 ))
 ->values(array(
-  'path' => 'core/modules/simpletest/files/imagecache',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => '_imagecache_menu_access_public_files',
-  'access_arguments' => 'a:0:{}',
-  'page_callback' => 'imagecache_cache',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '31',
-  'number_parts' => '5',
-  'tab_parent' => '',
-  'tab_root' => 'core/modules/simpletest/files/imagecache',
-  'title' => '',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'email/%/%',
-  'load_functions' => 'a:2:{i:1;s:9:"node_load";i:2;N;}',
-  'to_arg_functions' => '',
-  'access_callback' => 'node_access',
-  'access_arguments' => 'a:2:{i:0;s:4:"view";i:1;i:1;}',
-  'page_callback' => 'email_mail_page',
-  'page_arguments' => 'a:2:{i:0;i:1;i:1;i:2;}',
-  'fit' => '4',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'email/%/%',
-  'title' => 'Email Contact Form',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'event',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'event_page',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '1',
-  'number_parts' => '1',
-  'tab_parent' => '',
-  'tab_root' => 'event',
-  'title' => 'Events',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '20',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => 'sites/all/modules/event/ical.inc',
-))
-->values(array(
-  'path' => 'event/dst',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'event_dst',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '3',
-  'number_parts' => '2',
-  'tab_parent' => '',
-  'tab_root' => 'event/dst',
-  'title' => 'Event dst view',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'event/feed',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'event_feed',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '3',
-  'number_parts' => '2',
-  'tab_parent' => '',
-  'tab_root' => 'event/feed',
-  'title' => 'Event rss feed',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'event/ical',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'event_ical',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '3',
-  'number_parts' => '2',
-  'tab_parent' => '',
-  'tab_root' => 'event/ical',
-  'title' => 'Event ical feed',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => 'sites/all/modules/event/ical.inc',
-))
-->values(array(
-  'path' => 'event/term',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'event_term',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '3',
-  'number_parts' => '2',
-  'tab_parent' => '',
-  'tab_root' => 'event/term',
-  'title' => 'Filter by taxonomy',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'event/type',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'event_type',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '3',
-  'number_parts' => '2',
-  'tab_parent' => '',
-  'tab_root' => 'event/type',
-  'title' => 'Filter by content type',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'filefield/ahah/%/%/%',
-  'load_functions' => 'a:3:{i:2;N;i:3;N;i:4;N;}',
-  'to_arg_functions' => '',
-  'access_callback' => 'filefield_edit_access',
-  'access_arguments' => 'a:2:{i:0;i:2;i:1;i:3;}',
-  'page_callback' => 'filefield_js',
-  'page_arguments' => 'a:3:{i:0;i:2;i:1;i:3;i:2;i:4;}',
-  'fit' => '24',
-  'number_parts' => '5',
-  'tab_parent' => '',
-  'tab_root' => 'filefield/ahah/%/%/%',
-  'title' => '',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
-  'path' => 'filefield/progress',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'filefield_progress',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '3',
-  'number_parts' => '2',
-  'tab_parent' => '',
-  'tab_root' => 'filefield/progress',
-  'title' => '',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
   'path' => 'filter/tips',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -28533,28 +27795,6 @@
   'file' => 'modules/node/node.pages.inc',
 ))
 ->values(array(
-  'path' => 'node/%/ical',
-  'load_functions' => 'a:1:{i:1;N;}',
-  'to_arg_functions' => '',
-  'access_callback' => 'event_ical_access',
-  'access_arguments' => 'a:1:{i:0;i:1;}',
-  'page_callback' => 'event_node_ical',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '5',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'node/%/ical',
-  'title' => 'Event ical',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => 'sites/all/modules/event/ical.inc',
-))
-->values(array(
   'path' => 'node/%/outline',
   'load_functions' => 'a:1:{i:1;s:9:"node_load";}',
   'to_arg_functions' => '',
@@ -28951,6 +28191,28 @@
   'file' => 'modules/node/node.pages.inc',
 ))
 ->values(array(
+  'path' => 'nodereference/autocomplete',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'nodereference_autocomplete_access',
+  'access_arguments' => 'a:1:{i:0;i:2;}',
+  'page_callback' => 'nodereference_autocomplete',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '3',
+  'number_parts' => '2',
+  'tab_parent' => '',
+  'tab_root' => 'nodereference/autocomplete',
+  'title' => 'Nodereference autocomplete',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '4',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => '',
+))
+->values(array(
   'path' => 'profile',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -29039,28 +28301,6 @@
   'file' => '',
 ))
 ->values(array(
-  'path' => 'system/files/imagecache',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => '1',
-  'access_arguments' => 'a:0:{}',
-  'page_callback' => 'imagecache_cache_private',
-  'page_arguments' => 'a:0:{}',
-  'fit' => '7',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'system/files/imagecache',
-  'title' => '',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'type' => '4',
-  'block_callback' => '',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'file' => '',
-))
-->values(array(
   'path' => 'taxonomy/autocomplete',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -29457,18 +28697,18 @@
   'file' => 'modules/user/user.pages.inc',
 ))
 ->values(array(
-  'path' => 'user/timezone',
+  'path' => 'userreference/autocomplete',
   'load_functions' => '',
   'to_arg_functions' => '',
-  'access_callback' => '1',
-  'access_arguments' => 'a:0:{}',
-  'page_callback' => 'user_timezone',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
+  'page_callback' => 'userreference_autocomplete',
   'page_arguments' => 'a:0:{}',
   'fit' => '3',
   'number_parts' => '2',
   'tab_parent' => '',
-  'tab_root' => 'user/timezone',
-  'title' => 'User timezone',
+  'tab_root' => 'userreference/autocomplete',
+  'title' => 'Userreference autocomplete',
   'title_callback' => 't',
   'title_arguments' => '',
   'type' => '4',
@@ -31588,10 +30828,10 @@
   'name' => 'nodereference',
   'type' => 'module',
   'owner' => '',
-  'status' => '0',
+  'status' => '1',
   'throttle' => '0',
   'bootstrap' => '0',
-  'schema_version' => '-1',
+  'schema_version' => '6001',
   'weight' => '0',
   'info' => 'a:10:{s:4:"name";s:14:"Node Reference";s:11:"description";s:59:"Defines a field type for referencing one node from another.";s:12:"dependencies";a:3:{i:0;s:7:"content";i:1;s:4:"text";i:2;s:13:"optionwidgets";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
@@ -31636,10 +30876,10 @@
   'name' => 'userreference',
   'type' => 'module',
   'owner' => '',
-  'status' => '0',
+  'status' => '1',
   'throttle' => '0',
   'bootstrap' => '0',
-  'schema_version' => '-1',
+  'schema_version' => '6002',
   'weight' => '0',
   'info' => 'a:10:{s:4:"name";s:14:"User Reference";s:11:"description";s:56:"Defines a field type for referencing a user from a node.";s:12:"dependencies";a:3:{i:0;s:7:"content";i:1;s:4:"text";i:2;s:13:"optionwidgets";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
@@ -32684,6 +31924,31 @@
   'timezone_id',
 ))
 ->values(array(
+  'uid' => '0',
+  'name' => '',
+  'pass' => '',
+  'mail' => '',
+  'mode' => '0',
+  'sort' => '0',
+  'threshold' => '0',
+  'theme' => '',
+  'signature' => '',
+  'signature_format' => '0',
+  'created' => '0',
+  'access' => '0',
+  'login' => '0',
+  'status' => '0',
+  'timezone' => NULL,
+  'language' => '',
+  'picture' => '',
+  'init' => '',
+  'data' => NULL,
+  'timezone_name' => '',
+  'pass_plain' => '',
+  'expected_timezone' => NULL,
+  'timezone_id' => '0',
+))
+->values(array(
   'uid' => '1',
   'name' => 'root',
   'pass' => '63a9f0ea7bb98050796b649e85481845',
@@ -32695,8 +31960,8 @@
   'signature' => '',
   'signature_format' => '0',
   'created' => '0',
-  'access' => '1444943005',
-  'login' => '1444943005',
+  'access' => '1446553984',
+  'login' => '1446547011',
   'status' => '1',
   'timezone' => NULL,
   'language' => '',
@@ -33337,7 +32602,7 @@
 ))
 ->values(array(
   'name' => 'content_extra_weights_story',
-  'value' => 'a:9:{s:5:"title";s:2:"-5";s:10:"body_field";s:2:"-2";s:20:"revision_information";s:2:"19";s:6:"author";s:2:"18";s:7:"options";s:2:"20";s:16:"comment_settings";s:2:"22";s:4:"menu";s:2:"-3";s:8:"taxonomy";s:2:"-4";s:11:"attachments";s:2:"21";}',
+  'value' => 'a:11:{s:5:"title";s:2:"-5";s:10:"body_field";s:2:"-2";s:20:"revision_information";s:2:"23";s:6:"author";s:2:"22";s:7:"options";s:2:"24";s:16:"comment_settings";s:2:"26";s:4:"menu";s:2:"-3";s:8:"taxonomy";s:2:"-4";s:4:"book";s:2:"11";s:4:"path";s:2:"27";s:11:"attachments";s:2:"25";}',
 ))
 ->values(array(
   'name' => 'content_extra_weights_test_page',
@@ -33745,7 +33010,7 @@
 ))
 ->values(array(
   'name' => 'javascript_parsed',
-  'value' => 'a:0:{}',
+  'value' => 'a:14:{i:0;s:14:"misc/jquery.js";i:1;s:14:"misc/drupal.js";i:2;s:17:"misc/tabledrag.js";i:3;s:32:"sites/all/modules/cck/content.js";s:10:"refresh:fr";s:7:"waiting";i:4;s:16:"misc/textarea.js";i:5;s:16:"misc/collapse.js";i:6;s:20:"misc/autocomplete.js";i:7;s:12:"misc/form.js";i:8;s:19:"misc/tableselect.js";i:9;s:19:"misc/tableheader.js";i:10;s:19:"misc/jquery.form.js";i:11;s:12:"misc/ahah.js";i:12;s:14:"misc/teaser.js";}',
 ))
 ->values(array(
   'name' => 'language_content_type_article',
@@ -33773,7 +33038,7 @@
 ))
 ->values(array(
   'name' => 'menu_masks',
-  'value' => 'a:22:{i:0;i:127;i:1;i:63;i:2;i:62;i:3;i:61;i:4;i:59;i:5;i:31;i:6;i:30;i:7;i:29;i:8;i:24;i:9;i:21;i:10;i:15;i:11;i:14;i:12;i:13;i:13;i:12;i:14;i:11;i:15;i:7;i:16;i:6;i:17;i:5;i:18;i:4;i:19;i:3;i:20;i:2;i:21;i:1;}',
+  'value' => 'a:21:{i:0;i:127;i:1;i:63;i:2;i:62;i:3;i:61;i:4;i:59;i:5;i:31;i:6;i:30;i:7;i:29;i:8;i:24;i:9;i:21;i:10;i:15;i:11;i:14;i:12;i:13;i:13;i:12;i:14;i:11;i:15;i:7;i:16;i:6;i:17;i:5;i:18;i:3;i:19;i:2;i:20;i:1;}',
 ))
 ->values(array(
   'name' => 'menu_override_parent_selector',