database commit
sqlitedal
merge wenbin's 2 commits
Merge pull request #2 from ggxx/wenb302-master

mer1