Added internationalization support.
Merge branch 'master' of https://github.com/rajendersaini/cabms.git
resolved git conflict