Fixed layout.
Fixed push notifications.
Merge branch 'dev' of github.com:callista-software/netcare-healthplan into dev