Add NotRequiredIfOneOf validator to other fields too
Merge branch 'develop' of github.com:cmbi/xssp-rest into develop

Conflicts:
	xssp_rest/frontend/dashboard/forms.py