Added functionality to Router.map to allow it to be called multiple times without the map being overwritten. Allows routes to be added at runtime. One test with multiple cases also added.

Conflicts:

	packages/ember-routing/lib/system/router.js