Merge pull request #849 from akvo/feature/719-mobile-assignment-data-entry