all
Merge branch 'master' of https://github.com/mohamedaeldin/property

Conflicts:
	Property.xcodeproj/project.pbxproj
	Property.xcodeproj/project.xcworkspace/xcuserdata/mohamedalaael-din.xcuserdatad/UserInterfaceState.xcuserstate
	Property.xcodeproj/project.xcworkspace/xcuserdata/osamaaziz.xcuserdatad/UserInterfaceState.xcuserstate
	Property.xcodeproj/xcuserdata/osamaaziz.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
	Property/Business/PropertyAdvisorUpdater.h
	Property/Business/PropertyAdvisorUpdater.m
	Property/DashBoard.m
	Property/DashBoard.xib
	Property/DetailsView.h
	Property/DetailsView.m
	Property/DetailsView.xib
	Property/EgyptView.m
	Property/EgyptView.xib
	Property/MagazineView.m
	Property/MagazineView.xib
	Property/Models/MagazineImageTag.h
	Property/Models/PropertyItem.h
	Property/Models/PropertyItem.m
	Property/Property-Info.plist
	Property/SplashView.m
	Property/SplashView.xib
	Property/TableCell.h
	Property/TableCell.m
	Property/TableCell.xib
	Property/Utilities/PropertyAdvisorEnums.h
	Property/Utilities/PropertyAdvisorUtilities.m