User to string
Contact  to string
Merge branch 'dev'