Taher
Taher
Taher
Merge branch 'devel' of http://github.com/TaherGhasimakbari/simpatico into devel

Conflicts:
	.gitignore
	src/mcMd/diagnostics/mcSystem/McChemicalPotential.cpp
	src/mcMd/diagnostics/mcSystem/McChemicalPotential.h
	tools/cpp/chainMaker/in.L8
	tools/python/TextWrapper.pyc
	tools/python/makeDepend.pyc