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/datafactory.py

@@ -246,6 +246,7 @@ class DataFactory(object):
 
             row = {'reference_id': item['reference_id'],
                    'row_id': item['row_id'],
+                   'id': item['row_id'],
                    'date': item['date'],
                    'started': item['started'],
                    'stopped': item['stopped'],