Merge tag 'state_machine' into develop

v1.64

* tag 'state_machine':
  some refactoring
install cocoon
cocoon. comments in a post
Merge branch 'feature/cocoon' into develop

* feature/cocoon:
  cocoon. comments in a post
  install cocoon
i18n integration fix
Merge branch 'hotfix/i18n_fixes'

* hotfix/i18n_fixes:
  i18n integration fix
Merge tag 'i18n_fixes' into develop

v1.65

* tag 'i18n_fixes':
  i18n integration fix

Conflicts:
	app/views/layouts/application.html.haml
cocoon
Merge branch 'release/v1.70'

* release/v1.70:
  cocoon
  cocoon. comments in a post
  install cocoon