update database version
merge branch master