Refactoring

encoding added to pom.xml
Messages.java added as message catalog
Conflict solved