FIX gwt.xml for correct language display
Added Mappings resource and unit tests, refactoring