apply simple_form
Merge branch 'feature-simpleform' into develop

* feature-simpleform:
  apply simple_form