Merge branch 'hotfix/0.8.2.6'
Merge branch 'release/0.8.3.4-beta' into develop
Merge branch 'hotfix/0.8.3.5-beta' into develop

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
Changed PlexLibrary.fetch_episodes() 'retry_sleep' to 2 seconds
Changed PlexLibrary.fetch_episodes() 'max_retries' to 2
Changed default 'retry_sleep' to 2 seconds
Filters now use normalized matching
trakt 'plugin_version' and 'media_center_version' parameters are now set
Updated trakt.py
Fixed client filter bug in logging activity
Filters now use normalized matching
Fixed client filter bug in logging activity
Bumped version to 0.8.2.7
Merge branch 'hotfix/0.8.2.7'
Merge branch 'hotfix/0.8.2.7' into develop

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
Added 'netloc', 'user_name', 'user_id' and 'client' matching to [activity_logging]
[logging] support for user filtering, better support for client filtering
Added 'ipaddress' library (https://github.com/phihag/ipaddress)
Implemented "Filter - IP Networks" option
Merge branch 'feature/filters/ip-networks' into develop

Conflicts:
	Trakttv.bundle/Contents/Code/pts/scrobbler.py