merged fixes and added ember_resource_controller