Enable deploy with capistrano
Merge branch 'master' into integrate-design
Modify the database config file