more updates
removed blue files, zip will be attached to design and on docs as dl
hopefully final updates to template switching
Merge remote-tracking branch 'remotes/origin/D962' into release-7.0.2.0

Conflicts:
	catalog/includes/classes/template.php