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

diff --cc app/assets/javascripts/work/controllers.js.coffee.erb
Simple merge

diff --cc app/assets/javascripts/work/forms.js.coffee.erb
Simple merge

diff --cc app/assets/javascripts/work/items.js.coffee.erb
Simple merge

diff --cc app/assets/javascripts/work/list_groups.js.coffee.erb
Simple merge

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

diff --cc app/assets/javascripts/work/profilers.js.coffee.erb
Simple merge