Merge branch 'release/0.8.0.5-beta' into develop
Adjusted logging activity PARAM_REGEX pattern to match 'X-' style keys
Bumped version to 0.7.13.5
Merge branch 'hotfix/0.7.13.5'
Merge branch 'master' into develop

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
Bumped version to 0.8.0.6
Merge branch 'release/0.8.0.6-beta' into beta

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py