pull origin master

app/views/api/restaurant/menu/_menu_item.json.jbuilder

@@ -92,9 +92,9 @@ json.options opt_format
 json.instances item.menu_item_instances do |is|
   # Convert id to name for attributes
   instance_attr = []
-  is.item_attributes do |ia|
-    mItemAttr = MenuItemAttribute.find(is)
-    instance_attr.push(ia.name)
+  is.item_attributes.each do |ia|
+    # mItemAttr = MenuItemAttribute.find(is)
+    instance_attr.push(ia)
   end
   
     json.id is.id

app/views/api/restaurant/menu_item_attributes/show.json.jbuilder

@@ -0,0 +1,8 @@
+if(@attribute)
+  json.id @attribute.id
+  json.type @attribute.attribute_type
+  json.name @attribute.name
+  json.value @attribute.value
+else
+  json.success false
+end