Conflicts:
	src/ExchangeOperator.C

git-svn-id: http://qboxcode.org/svn/qb/branches/hse-dev@1405 cba15fb0-1239-40c8-b417-11db7ca47a34