temporary fix for sddatamap type conversion issue.
Merge branch 'refs/heads/sd-master' into rx-integration

Conflicts:
	Source/Foundation/SDDataMap.m
new SDPickerView
new SDPickerView
Added canceled to the picker completion blocks
Merge branch 'master' of github.com:walmartlabs-wmusiphone/ios-shared into rx-integration
Merge branch 'rx-integration' of github.com:walmartlabs-wmusiphone/ios-shared into rx-integration
Moved generics marker for NSString to NSString+SDExtensions.
Merge pull request #41 from walmartlabs-wmusiphone/rx-integration

Rx integration