Merge branch 'nightly' into python3

# Conflicts:
#	plexpy/activity_pinger.py
#	plexpy/activity_processor.py
#	plexpy/helpers.py
#	plexpy/notifiers.py
#	plexpy/version.py
#	plexpy/webserve.py

plexpy/database.py

@@ -250,7 +250,7 @@ class MonitorDatabase(object):
         sql_results = self.action(query, args).fetchone()
 
         if sql_results is None or sql_results == "":
-            return ""
+            return {}
 
         return sql_results