Fix compilation on jdk1.6
Switch to java6
Upgrade Guava