Update to latest version of ember-cli and fix friend resource

You need to run npm install after merging :)