mv mapper on mappers folder
Merge branch 'poro_entities' into working
Marshaling of I18n
Merge pull request #9 from locomotivecms/marshaling_of_i18n

Marshaling of i18n
Merge branch 'master' into poro_entities