updated to latest master and fixed pom.xml to include all modules