Merge pull request #4094 from emberjs/fix-meta

forgot to add proto
Merge pull request #3696 from twokul/composable-cp

[FEATURE beta] Composable Computed Properties
Update VERSION post-release.
[FEATURE ember-routing-drop-deprecated-action-style] Enhanced actions

This satisfied #3808
[DOC release] Show RSVP.Promise preamble.
Merge pull request #4068 from bcardarella/bc-flag-for-deprecating-actions-behavior

[FEATURE ember-routing-drop-deprecated-action-style] Enhanced actions
Merge pull request #4101 from rjackson/fixup_rsvp_docs

[DOC release] Show RSVP.Promise preamble.
[Bugfix release] [fixes #4102] templates component properties should not collide with internal properties.

@stefanpenner / @kselden
Merge pull request #4103 from stefanpenner/fix_templateless_components

[Bugfix release] [fixes #4102] templates component properties should not...
[BUGFIX beta] Allow Ember.computed.sort to use property paths in sortDefinitions.

'Ember.computed.sort' 'works only if sortDefinitions contain simple properties.
It will fail if a `sortDefinition` contains a property path (i.e. something
like `person.name`).

A `SearchProxy` is used to shadow the new value of an underlying property with
the old value to ensure proper comparisons take place while searching for an
item in the sorted array. When using a property path rather than a simple
property to sort on, `SearchProxy` will use the actual property path in its
attempt to shadow underlying properties - something like: `{ person.name: 'John
Doe' }`. This causes things to blow up because every comparison between an
existing item `get(itemA, sortProperty)` and a SearchProxy `get(itemB,
sortProperty)` will return a bogus result. In this case, `get(itemB,
'person.name')` will not return the shadowed value (stored as `{ person.name:
'John Doe' } `) but rather the current value of that path on the proxy's
underlying `content`.

This commit allows a proper comparison to take place when a sortDefinition
contains a property path.
[Bugfix beta] improve action without actions hash deprecation warning
[FEATURE ember-metal-is-blank]
Merge pull request #4049 from efigarolam/master

[FEATURE] isBlank method for filtering whitespace strings
[BUGFIX] Create _super when applying mixins. Use __nextSuper in wrappers

This sets _super on the context of all Ember objects, and also sets _super
on mergedProperty contexts if they have a property that is a function.

Fixes #3523, discussed in #3683
[BUGFIX release] Reduce read-only calls to meta
[BUGFIX release] Pass meta into watchKey when possible
[BUGFIX release] Reduce even more meta calls by passing it along in other places
[BUGFIX release] Reduce even more meta calls by passing it along in other places (doh, missed one)
[BUGFIX beta] fixed issue with transition.resolvedModels

Already-resolved parent models weren't showing
up in modelFor hook post-refactor

cc @wagenet
Merge pull request #3683 from mixonic/super

[BUGFIX] Ever-present _super, avoids infinite loop case