pom.xml, compiler version changed to 1.6
Merge branch 'master' of git@github.com:mcapino/trajectorytools.git