fix database bugs
Merge branch 'master' of github.com:deerstalker/ConupSamples