Add NotRequiredIfOneOf validator (#42)
Merge branch 'develop' of https://github.com/cmbi/xssp-rest into develop

Conflicts:
	xssp_rest/frontend/dashboard/forms.py