added javadocs, default contact related changes
Merge branch 'master' of https://github.com/pajac/ShapeSim