nearly finished phase 1
added a bit of javadoc
Update BasicJoin.java
fixed compilation problems
Merge branch 'master' into ant