fix conflict with jdbc
Merge pull request #5 from autoschool/DB_and_models

fix conflict with jdbc