Calendar added,
Rashid Git test
Resolve conflicts
DietPlanner Complete:
CreateOwnDiet, OwnDiet, DietPackages complete
views links updated in storyboard view controllers
Cell height increased for DietPackage
favorite image added in CellWithLeftImage, DietPackageDetail updated
RecipeBook initial screen added.
Shopping List
main screen, strikethrough,
Functional aspects,
Edit with default table behaviour,
edit entry (drop down not implemented)
Recipe category added.
Merge branch 'feature-Rezepte' into develop

# By Muhammad Rashid (2) and Yunas Qazi (1)
* feature-Rezepte:
  Recipe category added.
  RecipeBook initial screen added.
  Rashid Git test

Conflicts:
	SchlankFit/SchlankFit.xcodeproj/project.pbxproj
	SchlankFit/SchlankFit.xcodeproj/project.xcworkspace/xcuserdata/rashid.xcuserdatad/UserInterfaceState.xcuserstate
Project State updated and Rashid dummy work added
DropDown picker added.
files group updated
Merge branch 'develop' of https://github.com/atif-coeus/SlimFit into develop

Conflicts:
	SchlankFit/SchlankFit.xcodeproj/project.pbxproj
	SchlankFit/SchlankFit.xcodeproj/project.xcworkspace/xcuserdata/coeus.xcuserdatad/UserInterfaceState.xcuserstate
	SchlankFit/SchlankFit/Base.lproj/Main.storyboard
Account,
My Profile and My Cooking Book.
Sorting by drag and drop in FavoriteRecipe
Data in MyProfile->Personal Info
TableView is replaced with UIPickerView in MyProfile->Personal Info
Merge branch 'feature/Main-Profile' of https://github.com/atif-coeus/SlimFit

Conflicts:
	SchlankFit/SchlankFit.xcodeproj/project.pbxproj
	SchlankFit/SchlankFit.xcodeproj/project.xcworkspace/xcshareddata/SchlankFit.xccheckout
	SchlankFit/SchlankFit.xcodeproj/project.xcworkspace/xcuserdata/rashid.xcuserdatad/UserInterfaceState.xcuserstate

Resolved conflicts