Pom changes
Some refractor and minor changes
Code cleaning
GWTP problems resolved