3.0 marshaller merge

This adds the ability to merge request data into an existing entity, including its associations. Closes https://github.com/cakephp/cakephp/issues/2868

Once this is merged, I will add the corresponding methods in the Table class.