Simplified example based on proposed changes in https://github.com/tildeio/router.js/pull/89
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes/parent-child-transition/detail.coffee