YH-122 templates folder copies to remote
Merge commit '320e050'

Conflicts:
	MANIFEST.in