Commit Sept 30 V1
Merge branch 'BranchDulce'

Conflicts:

appSalud/appSalud.xcodeproj/project.xcworkspace/xcuserdata/christopherha
rdy.xcuserdatad/UserInterfaceState.xcuserstate