Add database.example.yml to git
Add database.example.yml file -- wasn't under git control before
Merge branch 'master' into add_activity