fixing db
Merge branch 'master' of https://github.com/cwengcs/sample_app