fixed Picker
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into TylerMarioBranch

Conflicts:
	WellDoneiOS/NextPumpMapViewController.xib