YH-122 added manifest#
Merge commit '2cbbb4a'

Conflicts:
	MANIFEST.in