updated branches and added otp-java to it