add com.googlecode.json-simple to p2
Merge branch 'master' of git@github.com:angelozerr/tern.java.git