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

diff --cc app/assets/javascripts/yasapp.js
index 66d9c27,8360f56..12877aa
--- 1/app/assets/javascripts/yasapp.js
--- 2/app/assets/javascripts/yasapp.js
+++ b/app/assets/javascripts/yasapp.js
@@@ -307,12 -307,8 +307,11 @@@
  //= require_directory ./models
  //= require_directory ./view
  //= require_directory ./view/button
- //= require_directory ./view/image
  //= require_directory ./view/show
 +//= require_directory ./view/show/header
 +//= require_directory ./view/show/footer
  //= require_directory ./view/play
 +//= require_directory ./view/summary
  //= require_directory ./views
  //= require_directory ./views/folders
  //= require_directory ./views/artists