Merge branch 'hotfix/0.7.12.3'
Merge branch 'release/0.8.0.3-beta' into develop
Added support for metadata from the "TheTVDBdvdorder" agent
Bumped version to 0.7.13
Merge branch 'hotfix/0.7.13'
Merge branch 'master' into develop

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
Added support for metadata from the 'TheTVDBdvdorder' agent into the GUID parser
Fixed 'timedelta.total_seconds' compatibility issue with Python 2.6
Bumped version to 0.7.13.2
Merge branch 'hotfix/0.7.13.2'
Merge branch 'master' into develop

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

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