Merge branch 'master' of https://github.com/dpaid/DSTE_wed

Conflicts:

WeddingPlanners/WeddingPlanners.xcodeproj/project.xcworkspace/xcuserdata
/rohansawhney.xcuserdatad/UserInterfaceState.xcuserstate
	WeddingPlanners/WeddingPlanners/DatabaseComm.h
	WeddingPlanners/WeddingPlanners/DatabaseComm.m