pulling new changes
Merge branch 'master' of https://github.com/hogdevelopment/bat_combined

Conflicts:

BespokeLocationV2.xcodeproj/project.xcworkspace/xcshareddata/BespokeLoca
tionV2.xccheckout