can show map and marker now
Merge branch 'master' of https://github.com/kevingzhang/pebble-hike-victoria

Conflicts:
	client/router/router.coffee
	client/views/dialog/eventCreateDialog.html
merge