fixed bug: 'activity tracker Participant1 is logged in edits activities'
Fixed a bug with the tests in the activity tracker, now correctly expects activity text
patient dashboard graph doesn't throw on missing data [Finishes #76620088]
Set the legend of the activity viz to always show all categories. [Finishes: #76979406]
Merge branch 'master' into bootstrap_3_styling_update

Conflicts:
	spec/features/participant/activity_tracker_spec.rb
	spec/features/participant/thought_tracker_spec.rb