Updated web.xml, UserRoleHandler, and Texts.prop
Merged language files