Use the RouterState mixin in GameNav
Merge branch 'master' of https://github.com/hawkrives/svg-diplomacy

Conflicts:
	app/components/game-nav.js