Merge remote-tracking branch 'origin/updater' into updater

# Conflicts:
#	bazarr/check_update.py
#	bazarr/main.py
#	bazarr/scheduler.py
#	views/settings.tpl

bazarr/config.py

@@ -39,6 +39,8 @@ defaults = {
         'chmod': '0640',
         'subfolder': 'current',
         'subfolder_custom': '',
+        'update_restart': 'True',
+        'subfolder_custom': '',
         'upgrade_subs': 'True',
         'days_to_upgrade_subs': '7',
         'upgrade_manual': 'True',

bazarr/main.py

@@ -57,8 +57,6 @@ from get_providers import get_providers, get_providers_auth, list_throttled_prov
 from get_series import *
 from get_episodes import *
 
-if not args.no_update:
-    from check_update import check_and_apply_update
 from list_subtitles import store_subtitles, store_subtitles_movie, series_scan_subtitles, movies_scan_subtitles, \
     list_missing_subtitles, list_missing_subtitles_movies
 from get_subtitle import download_subtitle, series_download_subtitles, movies_download_subtitles, \