fixed config of travis
added jdk and fixed setting for oraclejdk7
removed oraclejdk6 because no such jdk
Merge branch 'fix-travis-setting'