added partial for 'my_profile' user nav
added fix to my profile displaying
merge
Merge branch 'staging' of github.com:JonahMoses/fourth_meal into staging
WIP restaurant admin link to restaurants on nav bar
Merge branch 'individual_restaurant_admins' of github.com:JonahMoses/fourth_meal into individual_restaurant_admin
merged
restaurant_admin
my restaurants link
Merge branch 'staging' of github.com:JonahMoses/fourth_meal into staging
passed tests
added ability to edit user details on checkout page
user emailed when new restaurant approved
Add item capabaility for admin and restaurant admin on menu page
corrected test describe
merged
update permission tests
Merge branch 'staging' into billing_details
restaurant_feature_spec test correction
merge conflict resloution