i18n added
Merge branch 'master' of
https://github.com/jbolaky/multi-java-frameworks-tutorials.git