Auto merge of #1626 - gnowoel:patch-1, r=locks
Auto merge of #1626 - gnowoel:patch-1, r=locks

Match code with the latest version

The code listing of `app/router.js` in the tutorial does not match the one generated with latest `ember-cli` (v2.7.0).

knownasilya/guides,MarkMT/guides,jkarsrud/guides,HeroicEric/guides,tleskin/guides,davidpett/guides,jkarsrud/guides,nicobot/guides,HeroicEric/guides,skaterdav85/guides,nicobot/guides,knownasilya/guides,tleskin/guides,knownasilya/guides,skaterdav85/guides,skaterdav85/guides,davidpett/guides,knownasilya/guides,nicobot/guides,MarkMT/guides,jkarsrud/guides,MarkMT/guides,tleskin/guides,jkarsrud/guides,davidpett/guides,skaterdav85/guides,HeroicEric/guides,MarkMT/guides,davidpett/guides