Added localization
Merge branch 'develop' of https://github.com/sapienstech/alisconfig into localization