change db structure
merge from master