i18n / refactoring 2
Merge branch 'master' of https://github.com/roschee/c2.git