Recipe Page and Recipe Detail Page

Recipe Page and Recipe Detail Page are modified according to the style
guide. Only one criteria—padding is missing for now. Will add it in
later.
Merge branch 'master' of https://github.com/dcdinicola/Group_App_Working_Folder_The_Pantry_Planner

Conflicts:

MyFirstApplication-2/app/src/main/java/com/irissonghy/myfirstapplication
/PantryPopupActivity.java
Revert "Merge branch 'master' of https://github.com/dcdinicola/Group_App_Working_Folder_The_Pantry_Planner"

This reverts commit 831b6760a22a87a57f2488d8979124f1d8cf0627, reversing
changes made to fa7bd6aa58e0288d10704f3a96fe4bd2f49aee37.
something wrong with local repo
eliminate conflict in Favorites
Revert 97c7954..122eb93

This rolls back to commit 97c7954ea016d44bec28f2f9507e6bc2b073ecbf.
add description to favorites

- Rename some textviews in main and profile to eliminate conflicts
Merge branch 'master' into iris