Only setting content-type to JSON if there actually is content.
Merge branch 'master' of github.com:enyo/data
Added a test for the content-type.
Only setting content-type to JSON if there actually is content.
Added a test for the content-type.
update the rest adapter test to pass the json content-type behavior
[Fixes #674] Loading embedded relationship in sideloaded relationship
fix for embedded records not being loaded when their parent is sideloaded
WIP: bump RSVP2
Handle record self fulfillment
Merged lord-spam
Merge branch 'master' of https://github.com/emberjs/data
Removed the deprecated tests.
Merge pull request #1 from teddyzeenny/rsvp2-self-fulfillment

Handle record self fulfillment
Utilize DeferredMixin and fix creation fulfillment
Merge branch 'rsvp2'

Conflicts:
	Gemfile
	Gemfile.lock
	packages/ember-data/tests/integration/adapters/basic_adapter/commit_test.js
	packages/ember-data/tests/integration/adapters/basic_adapter/find_test.js
use new promise syntax
reduce line length
use local defered mixin reference
Fix test syntax error