Merge branch 'master' of github.com:setdirection/ios-shared
Merge branch 'master' of github.com:walmartlabs-asdaios/ios-shared
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:setdirection/ios-shared
Merge branch 'master' of github.com:setdirection/ios-shared
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' of github.com:setdirection/ios-shared
Merge remote-tracking branch 'upstream/master'
files needed for SDEditQuantityView
removed all mentions of ASDA
switched enum to NS_ENUM
removed methods that only call super
created typedefs for blocks
replaced magic numbers with constants.

so less magic :(
wrap setters in if (_myThing  != youThing)
removed self. in inits
got rid of tabs
changed property to copy
removed comment about trolley