rm old java7 grammar and add Sam/Terence Java 7 grammar as just java; we can label various java version like 7 and 8