merge:

diff --cc app/assets/javascripts/models/comic.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/comic_story.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/license.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/original_picture.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/panel.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/resource_picture.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/scroll.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/scroll_panel.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/sheet.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/sheet_panel.js.coffee
index bba64e3,00d03fc..d4c660e
--- 1/app/assets/javascripts/models/sheet_panel.js.coffee
--- 2/app/assets/javascripts/models/sheet_panel.js.coffee
+++ b/app/assets/javascripts/models/sheet_panel.js.coffee
@@@ -18,12 -18,13 +18,13 @@@ class Pettanr.SheetPanel extends Peta.L
    } \r
    \r
    sheet: () ->\r
 -    new Pettanr.Sheet({id: @get('sheet_id')})\r
 +    new Pettanr.Cache.Retriever(Pettanr.Sheet, @get('sheet_id'))\r
    \r
    panel: () ->\r
 -    new Pettanr.Panel({id: @get('panel_id')})\r
 +    new Pettanr.Cache.Retriever(Pettanr.Panel, @get('panel_id'))\r
    \r
-   initialize: () ->\r
+   initialize: (attr = {}, options = {}) ->\r
+     super(attr, options)\r
      if @id\r
        @url = @url + @id\r
    \r

diff --cc app/assets/javascripts/models/speech_balloon_template.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/story.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/story_sheet.js.coffee
Simple merge

diff --cc app/assets/javascripts/models/system_picture.js.coffee
index f7c2832,d2c0856..36bda58
--- 1/app/assets/javascripts/models/system_picture.js.coffee
--- 2/app/assets/javascripts/models/system_picture.js.coffee
+++ b/app/assets/javascripts/models/system_picture.js.coffee
@@@ -35,14 -35,11 +35,15 @@@ class Pettanr.SystemPicture extends Pet
      })\r
    \r
    symbol_option: () ->\r
 -    @fetch({cache: true}).done =>\r
 -      @trigger('ready:symbol', @tmb_opt_img_tag())\r
 +    retriever = @retriever()\r
 +    @listenTo(retriever, 'retrieve', @retrieve_symbol)\r
 +    retriever.retrieve()\r
 +  \r
 +  retrieve_symbol: (item) -> \r
 +    @trigger('ready:symbol', item.tmb_opt_img_tag())\r
    \r
-   initialize: () ->\r
+   initialize: (attr = {}, options = {}) ->\r
+     super(attr, options)\r
      if @id\r
        @url = @url + @id\r
    \r

diff --cc app/assets/javascripts/models/writing_format.js.coffee
index 2bc9587,bc3b1a2..9921758
--- 1/app/assets/javascripts/models/writing_format.js.coffee
--- 2/app/assets/javascripts/models/writing_format.js.coffee
+++ b/app/assets/javascripts/models/writing_format.js.coffee
@@@ -12,17 -12,15 +12,18 @@@ class Pettanr.WritingFormat extends Pet
    } \r
    \r
    system_picture: () ->\r
 -    new Pettanr.SystemPicture({id: @get('system_picture_id')})\r
 +    new Pettanr.Cache.Retriever(Pettanr.SystemPicture, @get('system_picture_id'))\r
    \r
    symbol_option: () ->\r
 -    i = @system_picture()\r
 -    i.fetch({cache: true}).done =>\r
 -      @trigger('ready:symbol', i.tmb_opt_img_tag())\r
 +    retriever = @system_picture()\r
 +    @listenTo(retriever, 'retrieve', @retrieve_system_picture)\r
 +    retriever.retrieve()\r
 +  \r
 +  retrieve_system_picture: (item) -> \r
 +    @trigger('ready:symbol', item.tmb_opt_img_tag())\r
    \r
-   initialize: () ->\r
+   initialize: (attr = {}, options = {}) ->\r
+     super(attr, options)\r
      if @id\r
        @url = @url + @id\r
    \r