Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

diff --cc app/assets/javascripts/panels.js.coffee
index a0fd330,5e2e622..b541b22
--- 1/app/assets/javascripts/panels.js.coffee
--- 2/app/assets/javascripts/panels.js.coffee
+++ b/app/assets/javascripts/panels.js.coffee
@@@ -12,12 -12,8 +12,13 @@@ $ -
      v.add_helper( n, '' )\r
    PictureSizeHelper = window.PettanrPictureSizeHelper\r
    ColorHelper = window.PettanrColorHelper\r
+   PopupHelper = window.PettanrPopupHelper\r
    \r
 +  #panel = new Panel\r
 +  #pp = new PanelPicture\r
 +  #pp.set_panel(panel)\r
 +  #confirm( PanelPicture.test()  )\r
 +  #confirm( pp.test() )\r
    find_configurations = ( hash, key) ->\r
      if typeof(hash[key]) == 'string'\r
        find_configurations(hash, hash[key])\r