Handle conflicts (better)
Handle conflicts (better)
Merge branch 'master' of https://github.com/rasmus-n/hdhrRec

Conflicts:
	db_tools/tvdb.py