use oracle7 in travis
use java 7 protobuf 2.5
Merge branch 'master' into 1.1