contacts merged with stash...
Merge branch 'origin/feature-addressbook-concept'
merged contacts fix