added check for nil
Merge branch 'master' of https://github.com/NUBIC/ncs_navigator_core

Conflicts:
	app/views/participants/_activities.html.haml