Added a  new java project
Merge branch 'origin/develop'