without java 1.7
Merge branch 'database_branch' of https://github.com/aslanpro/JavaTestProject into database_branch