[in progress] Planning units in dashboard map directive. Refs #187.
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/apps/survey/templates/survey/dash.html