add gem cocoon
modify model and views
Merge branch 'feature/cocoon' into develop

* feature/cocoon:
  modify model and views
  add gem cocoon
add favicon