Merge branch 'hotfix/0.7.13.6'
Merge branch 'release/0.8.1.0'
Merge branch 'hotfix/0.8.1.1'

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
Merge branch 'release/0.8.1.2'

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
Merge branch 'release/0.8.2'
Fixed bug in migrator which broke any new installs
Bumped version to 0.8.2.2
Merge branch 'hotfix/0.8.2.2' into develop

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