Merge remote-tracking branch 'origin/master'

Conflicts:
	American tv series/Hell on wheels/Hell on wheels s01.xml
	American tv series/Hell on wheels/Hell on wheels s02.xml
	American tv series/Hell on wheels/Hell on wheels s03.xml
	American tv series/Hostages/Hostages.xml
	American tv series/Orange is the new black/orange is the new black
season 1.xml
	American tv series/Orange is the new black/orange is the new black
season 2.xml
	American tv series/Person of interest/Person of interest s01.xml
	American tv series/Person of interest/Person of interest s02.xml
	American tv series/Person of interest/Person of interest s03.xml
	American tv series/Power/Power season 1.xml
	American tv series/Ravenswood/Ravenswood season 1.xml
	American tv series/Ray donovan/Ray Donovan season 1.xml
	American tv series/Revolution/Revolution season 1.xml
	American tv series/Revolution/Revolution season 2.xml
	American tv series/Salem/Salem season 1.xml
	American tv series/Sleepy hollow/Sleepy hollow season 1.xml
	American tv series/SonsOfAnarchy/SonsofanarchyS01.xml
	American tv series/SonsOfAnarchy/SonsofanarchyS02.xml
	American tv series/SonsOfAnarchy/SonsofanarchyS03.xml
	American tv series/SonsOfAnarchy/SonsofanarchyS04.xml
	American tv series/SonsOfAnarchy/SonsofanarchyS05.xml
	American tv series/SonsOfAnarchy/SonsofanarchyS06.xml
	American tv series/Spartacus/Spartacus season 1.xml
	American tv series/Spartacus/Spartacus season 2.xml
	American tv series/Spartacus/Spartacus season 3.xml
	American tv series/Teen wolf/teen wolf season 1.xml
	American tv series/Teen wolf/teen wolf season 2.xml
	American tv series/Teen wolf/teen wolf season 3.xml
	American tv series/Teen wolf/teen wolf season 4.xml
	American tv series/The 100/the 100 season 1.xml
	American tv series/The blacklist/the blacklist season 1.xml
	American tv series/The bridge/the bridge season 1.xml
	American tv series/The millers/the millers season 1.xml
	American tv series/The originals/The originals season 1.xml
	American tv series/The tomorrow people/the tomorrow people s01.xml
	American tv series/The walking dead/the walking dead season 1.xml
	American tv series/The walking dead/the walking dead season 2.xml
	American tv series/The walking dead/the walking dead season 3.xml
	American tv series/The walking dead/the walking dead season 4.xml
	American tv series/True blood/true blood season 1.xml
	American tv series/True blood/true blood season 2.xml
	American tv series/True blood/true blood season 3.xml
	American tv series/True blood/true blood season 4.xml
	American tv series/True blood/true blood season 5.xml
	American tv series/True blood/true blood season 6.xml
	American tv series/True blood/true blood season 7.xml
	American tv series/True detective/true detective season1.xml
	American tv series/Turn/Turn season 1.xml
	American tv series/Under the dome/Under the dome season 1.xml
	American tv series/Under the dome/Under the dome season 2.xml
	American tv series/Vampire diaries/Vampire diaries season 1.xml
	American tv series/Vampire diaries/Vampire diaries season 2.xml
	American tv series/Vampire diaries/Vampire diaries season 3.xml
	American tv series/Vampire diaries/Vampire diaries season 4.xml
	American tv series/Vampire diaries/Vampire diaries season 5.xml
	American tv series/Vikings/Vikings season 1.xml
	American tv series/Vikings/Vikings season 2.xml
	American tv series/once upon a time/once upon a time s01.xml