Merge remote-tracking branch 'upstream/7.x' into 7.x

Conflicts:
	islandora_basic_collection/css/islandora_basic_collection.theme.css

islandora.module

@@ -96,10 +96,10 @@ function islandora_menu() {
   $items['islandora'] = array(
     'title' => 'Islandora Repository',
     'page callback' => 'islandora_view_default_object',
-    'type' => MENU_CALLBACK,
+    'type' => MENU_NORMAL_ITEM,
     'access arguments' => array(FEDORA_VIEW),
   );
-
+ 
   $items['islandora/object/%'] = array(
     'title' => 'Repository',
     'page callback' => 'islandora_view_object',

islandora_basic_image/islandora_basic_image.module

@@ -38,7 +38,7 @@ function islandora_basic_image_menu() {
     'page arguments' => array('islandora_basic_image_admin'),
     'file' => 'admin/islandora_basic_image.admin.inc',
     'type' => MENU_NORMAL_ITEM,
-  );
+  ); 
   /* example menu paths 
   $items['islandora/object/%/manage/image'] = array(
     'title' => 'Manage Image Types',