changes to branch

changes
Merge remote-tracking branch 'origin/newJavaBranch'