Favorite: add icon-star
Merge remote-tracking branch 'origin/nasty' into hostel
Edit make up
Avatar: show avatar in office
Favorite: style
Merge
favorite: show add push