Merge branch 'nightly' into python3

# Conflicts:
#	data/interfaces/default/current_activity_instance.html
#	plexpy/activity_handler.py
#	plexpy/graphs.py
#	plexpy/helpers.py
#	plexpy/pmsconnect.py
#	plexpy/version.py
#	plexpy/webserve.py

plexpy/notifiers.py

@@ -3533,7 +3533,7 @@ class WEBHOOK(Notifier):
     """
     NAME = 'Webhook'
     _DEFAULT_CONFIG = {'hook': '',
-                       'method': ''
+                       'method': 'POST'
                        }
 
     def agent_notify(self, subject='', body='', action='', **kwargs):
@@ -3579,8 +3579,7 @@ class WEBHOOK(Notifier):
                           'name': 'webhook_method',
                           'description': 'The Webhook HTTP request method.',
                           'input_type': 'select',
-                          'select_options': {'': '',
-                                             'GET': 'GET',
+                          'select_options': {'GET': 'GET',
                                              'POST': 'POST',
                                              'PUT': 'PUT',
                                              'DELETE': 'DELETE'}