Updated jni folder

merged jni/ folder with Daniel branch