fixed most .. ithink of the errors with the database

ase
Merge branch 'master' of https://github.com/pekaaw/MobileDevProject