Updated for routing chapter.
Merge branch 'master' of github.com:callista-software/spa-cadec-2013