Fixed merge conflict.
Initial commit for Contacts page.
Merge branch 'develop' of https://github.com/MitchelCabuloy/Caritas into dev
contact and stuff
merge conflicts
fixed service error