Merge branch 'feature/IOS-175-176-feature-availability-implementation' into feature/IOS-155-subscriptions

# Conflicts:
#	OneWeatherCore/OneWeatherCore.xcodeproj/project.pbxproj