update readme
update readme
add license
update db
merge master into psql