in project verify ok
Merge branch 'master' of github.com:timeblink/py4manifest

Conflicts:
	diff_by_manifest.py