pre-breakfast merge conflict resolution correction :P
Merge pull request #881 from twokul/master

minor fixes to CP guide
filterProperty is deprecated, replacing with filterBy

Link to ember source code with deprecation notice:

https://github.com/emberjs/ember.js/blob/b37f76edcbc0b83c8fb1453945dabc70f9eacb3c/packages/ember-runtime/lib/mixins/enumerable.js#L405
Merge pull request #882 from irae/patch-1

filterProperty is deprecated, replacing with filterBy
Merge branch 'master' of https://github.com/emberjs/website