modify model and action files.
Merge branch 'develop' of git@github.com:ErythroME/Goo.git into develop