Favorite button on contact page
Merge from origin/master