Publish context
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	accounting/src/main/resources/log4j.properties