add cocoon
add generators config
add editing comments
Merge branch 'feature/cocoon' into develop

* feature/cocoon:
  add editing comments
  add generators config
  add cocoon