fix workflow
Merge branch 'develop' of github.com:openeyes/cnd into develop

Conflicts:
	cndapp/templates/cndapp/followup_view.html
	cndapp/templates/cndapp/opnote_view.html
Merge branch 'develop' of github.com:openeyes/cnd into develop
Update datatables