Revert to c1b2988eb0c548e4b01a93759fcfd65614514309 (Merge branch 'hotfix/0.3.5')
Revert "Revert to c1b2988eb0c548e4b01a93759fcfd65614514309 (Merge branch 'hotfix/0.3.5')"

This reverts commit 1cc9c6127cb5e14ac72356e6814c078f04d8db7b.
Merge branch 'care-portal' into dev
tighen up care-portal so that the button is visible on even a 3.5 inch iPhone display; added some additional event types