New Setup Zip
Merge remote-tracking branch 'origin/master'

Conflicts:
	PseudoTV_Manager-stable.zip