Fixed error created by merge in relation to the date picker.
Fixed error created by merge in relation to the date picker.

mike-bynum/PawsAndStripesNativeApp,mike-bynum/PawsAndStripesNativeApp,mike-bynum/PawsAndStripesNativeApp