without java 1.7 file reading
Merge branch 'database_branch' into test_server