Add i18n language support and revise admin template
Merge branch 'master' into openshift