Merge branch 'master' into dataset_http_errors

.DS_Store

.gitignore

.gitmodules

OSX/Metabase.xcodeproj/project.pbxproj

OSX/Metabase/Backend/AppDelegate.h

OSX/Metabase/Backend/AppDelegate.m

OSX/Metabase/Backend/MetabaseTask.h

OSX/Metabase/Backend/MetabaseTask.m

OSX/Metabase/Backend/SettingsManager.h

OSX/Metabase/Backend/SettingsManager.m

OSX/Metabase/Backend/TaskHealthChecker.h

OSX/Metabase/Backend/TaskHealthChecker.m

...Metabase/Images.xcassets/AppIcon.appiconset/Contents.json

...Metabase/Images.xcassets/AppIcon.appiconset/Logo_1024.png

OSX/Metabase/Images.xcassets/AppIcon.appiconset/Logo_128.png

OSX/Metabase/Images.xcassets/AppIcon.appiconset/Logo_16.png

OSX/Metabase/Images.xcassets/AppIcon.appiconset/Logo_256.png

OSX/Metabase/Images.xcassets/AppIcon.appiconset/Logo_32.png

OSX/Metabase/Images.xcassets/AppIcon.appiconset/Logo_512.png

OSX/Metabase/Images.xcassets/AppIcon.appiconset/Logo_64.png