Allow custom commands to be accessed in blueprints
Single/doubl quotes
fixes the express not define error
fixes the tests errors
Merge pull request #1307 from dschmidt/master

Add verbose option to version command
Improve regex for finding existing routes
Merge pull request #1363 from fordguo/master

fixes the express not define error
Tests = happiness
Merge pull request #1350 from James1x0/master

Allow custom commands to be accessed in blueprints
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