change bonaparte-core to Java 1.6
Merge remote-tracking branch 'refs/remotes/upstream/master'