commit for merge2
Merge branch 'master' of https://github.com/public4111/db
add choosing email preference