TB-75 Complete. Added possibility of checking that two required fields are filled
Merge remote-tracking branch 'origin/develop' into develop