Refractored the CustomActivityService
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104
Fixed failing CustomActivityController tests
Merge branch 'CORE-1104' of github.com:frontlinesms/frontlinesms2 into CORE-1104