add composer
menu edition
Merge branch 'master' into 1.0

* master:
  menu edition
  add composer