Java Stuff

This is adding all the new Java stuff
Merge branch 'master' of https://github.com/sunblok/313