Merge branch 'feature/fix-readme-info'
- Changes in entities,controllers and templates that permits use
  i18n with gettext, close #2
Merge branch 'i18n' into develop