Improve regex for finding existing routes
Merge pull request #1371 from kimroen/improve-route-check

Improve regex for finding existing routes
Remove slash from some generator-locals

Conflicts:
	CHANGELOG.md
Merge pull request #1278 from kimroen/nested-generators

Change behaviour of standardLocals in blueprints for slashes
Don't add basic route to the router map
Merge pull request #1390 from kimroen/limit-basic-route

Don't add basic route to the router map
Default process.env.EMBER_ADDON_ENV to development
Merge pull request #1394 from bcardarella/bc-addon-env

Default process.env.EMBER_ADDON_ENV to development
[BUGFIX] fix processing of import statements in css
Merge pull request #1400 from joostdevries/use-relative-to-for-css-concat

[BUGFIX] fix processing of import statements in css
use the test env
added CHANGELOG entry
[BUGFIX] fix detection of static files to allow periods in urls
Merge pull request #1399 from joostdevries/allow-periods-in-url

[BUGFIX] fix detection of static files to allow periods in urls
bump bower deps
Merge pull request #1401 from marcoow/use-test-env

Use the test env
Npm dependencies in alphabetical order

Every `npm install some-package --save-dev` call orders the dependency list alphabetically. Thus, it makes sense to order the deps in the blueprint to ease ember cli app upgrades through `ember init`.
Merge pull request #1413 from manuelmitasch/patch-1

App blueprint: Npm dependencies in alphabetical order
Merge branch 'master' of https://github.com/stefanpenner/ember-cli