Updated the message catalog templates
fixed ClassCastException
Merge branch 'origin/master'