Update java files and make sure the project in up to date
Merge remote-tracking branch 'origin/master'