* upstream/master: (91 commits)
Responders now return 204 No Content for API requests without a response body (as in the new scaffold)
Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box.
Fix failing tests.
properly handle lists of lists. Thanks @adrianpike for reporting!
Fix that changing a store should mark the store attribute as changed
Clean up .gitignore and make a note about using global ignores
Revert "Ignore .rbx directories (rbx compiled bytecode files)"
Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup"
Fix deprecation warnings in action pack test suite due to passing template formats in the template name.
safeguard against configs missing environment or the database key
Remove needless to_param in scaffold functional test
Unused variable removed
minor revision to some new code in databases.rake
registers PR #2419 in the CHANGELOG
ActionPack test fix for RBX
Ignore .rbx directories (rbx compiled bytecode files)
edge doesnt provide turn gem in the gemfile anymore
Remove Turn from default Gemfile.
Revert "Merge pull request #3405 from arunagw/middleware_name"
minor fixes in the composed_of doc