database.yml error
Merge branch 'master' into backbone
precompile
precompile everything
Merge branch 'backbone'