german translation
capistrano
Merge branch 'staging'
db.yml
Merge branch 'staging'