avoiding conflicts
allow love sending via wl
Merge remote-tracking branch 'upstream/master' into video
more love code
more love
more love
more love
more love
mo love
mo love
display all love behavior in profile & some corrections
user profile love pagination + changing style
styling user loves at profile
css tweaks
making navbar buttons fit at smaller views
Merge branch '19896' of https://github.com/joanneci/worklist into 19896
Merge pull request #278 from joanneci/19896

CR for Job #19896 - Allow love to be sent via Worklist navbar and user profiles
fix for love cancel button
Merge pull request #279 from joanneci/19896

fix for love cancel button
Merge branch 'master' of https://github.com/highfidelity/worklist into 19975