Merge to pull in #1870 - Capture photo functionality
Kisitu / Godwin - [#1870] refactoring ViewAllEnquiriesActivity