test4 by ez
Merge branch 'master' of https://github.com/IHmantra/ihm.git

Conflicts:
	ihm2/docs/html/seller.txt