removing unused files
i18n solution done
Merge branch 'develop'