Merge branch 'develop'
added idl file
changed jvm
changed location => better for compilation of idl file
added to java path
changed some stuff
s
Merge branch 'master'