bug fix version 1.1 for production
resolving conflict of master with r2 contacts
r2 contcts changed after master merging