continue experiencing with the dialog.
The router file is merged.
Merge branch 'master' of https://github.com/kevingzhang/pebble-hike-victoria

Conflicts:
	client/router/router.coffee