Updated for Java 7
Merge branch 'master' of github.com:88Alex/dragon-database