Add and Retreive contact server side
Merge branch 'master' into contact
Retreive contacts works