database changes
Merge branch 'master' of github.com:congchen5/photofocus