adding db sql file
fix bug 2
continue to fix bug2
Merge branch 'bugfix_2'
fix the conflict between master and bugfix