Convert episode to item if brand removed
Merge branch 'pa-episode-to-item' into stage

Conflicts:
	src/main/java/org/atlasapi/remotesite/pa/ContentBuffer.java