Added java compiler settings (version 1.6)
Merge branch 'master' of github.com:ehannes/OpenFlisp into ehannes-master