Fixed PickerView baseWeight
Merge remote-tracking branch 'origin/TristanNew' into Connor

Conflicts:
	IviesCompanionApp/IviesCompanionApp/DrinkCounterViewController.xib