Merge pull request #34 from walmartlabs-wmusiphone/newSearchFix

added back the fix that fixed before
Merge branch 'master' into kazoo_dev
CB-2596: Added the ability to override the internal setActive lock of SDSearchDisplayController
issue/CB-2596: Another iteration on the same logic, centralizing logic inside the searchController
CB-2596: Additional comments
Merge pull request #36 from walmartlabs-wmusiphone/issue/CB-2596-rapid-tap-bug

CB-2596: Added the ability to override the internal setActive lock of SD...
Merge branch 'master' of https://github.com/setdirection/ios-shared into kazoo_dev
Merge pull request #37 from walmartlabs-wmusiphone/merge/from_set_direction

Merge/from set direction
Removed unused showNoConnectionAlert and the problematic reachability call following it.
CB-236: Added SDAssert replacement for NSAssert to be able to detect asserting at unit testing time.
Merge pull request #38 from walmartlabs-wmusiphone/issue/CB-236-free-unit-tests

CB-236: Added SDAssert replacement for NSAssert to be able to detect ass...
Fixed the cell height calculator so it is not dependent on the styler
Fixed calculatedHeightForCellInTableview so it isn't dependent on the walmart app
Merge pull request #40 from walmartlabs-wmusiphone/issue/styler_fix

Issue/styler fix
issue/CB-2616: fix for type ahead list scrolling bug
Merge pull request #42 from walmartlabs-wmusiphone/issue/CB-2616-scrolling-bug

issue/CB-2616: fix for type ahead list scrolling bug
moved base64StringFromData from ERExtensions to ios-shared string extensions
Merge pull request #46 from walmartlabs-wmusiphone/move_base64StringFromData

Moved base64StringFromData from ERExtensions to ios-shared string extensions
PR from kazoo_dev to iPad_dev, but manual merge to fix one merge conflict