modified:   config/database.yml
Merge branch 'master' of github.com:4thsource/modernmeal
modified:   config/social_config.rb