General java changes and database update
Merge branch 'master' of https://github.com/davigrangeiro/express-match