Merge pull request #170 from CruGlobal/MH-716

Fix error in Production - Null person for assigned_tos in reset form in ...
Merge branch 'master' into dev
Merge branch 'dev' of github.com:CruGlobal/missionhub into dev