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