Merge branch 'master' of git://github.com/emberjs/ember.js
change sendEvent signature from sendEvent(obj, name, …) to sendEvent(obj, name, params) to avoid copying the arguments.
Conflicts:

	packages/ember-metal/lib/events.js
Add test for router.urlForEvent - changing context in the current state should generate a new URL
Merge pull request #992 from rlivsey/url-generation-for-new-context

Changing context in the current state should generate a new URL
Documentation for Ember.Router, Ember.Route
Avoid deprecation warning for ViewState tests
How a deprecation typo is fixed?
Rename `fire` to `trigger`
Allow a one-time event listener on Ember.Evented

This commit allows you to listen for an event
once. Once the event fires, Ember immediately
unbinds it.

The API is modeled after jQuery's .one method.
Add version info (tag name and most recent commit into) to generated files
Don't fire deferred observers if obj is destroyed

This prevents a bug where an observer would
be fired in response to a binding synchronizing,
even if the object was destroyed.

Fixes #1000.
Merge branch 'master' into simplify-properties

Conflicts:
	packages/ember-runtime/lib/mixins/evented.js
fix issue #1022 lazy setup of @each misses first before event
Change app.stateManager to app.router
Implement a route's navigateAway event

The navigateAway event is triggered on a state if
the user changes the URL via the back/forward
buttons.
Substitute "router" for "state manager"

Now that it's "App.router" as of d23ea3a, we can be consistent.
Don't stopPropagation on action handling by default
Update connectOutlet documentation to reflect recent changes
Merge pull request #1039 from joliss/router

Substitute "router" for "state manager"
Merge pull request #1041 from joliss/doc

Update connectOutlet documentation to reflect recent changes