Travis-CI config: language java, and build on Oracle JDK7 and OpenJDK7
Build status image
Build status for both master and dev branches
Merge remote-tracking branch 'origin/master' into dev
fixed javadoc warning