Update facehub.cfg to use database url for connection, since we should
use sqlite under development, and it is easy to switch to any other
database in production
fixed conflict.
Merge branch 'database'