1223
Merge remote-tracking branch 'hermes/master'

Conflicts:
	hermes/hermes-web/src/main/webapp/jsp/admin/merchant/add.jsp