Merge SF_GIT/master

Conflicts:
	src/main/webapp/consultant/consultantChoosePayment.xhtml
Merge SF_GIT/master

Conflicts:
	src/main/webapp/consultant/consultantChoosePayment.xhtml