added contact functionanlity
fixed merge
removed relation from user
removed repeated code
Merge branch 'master' of https://github.com/caryli/beastgodcalendar
merging