separated boxes for friends, received requests, and sent requests
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator
More friends frontend changes
Fixed merge conflict