add pom version
add scala source to build.properties
Merge branch 'master' into p2