Switched apps to use label codes
Merge remote-tracking branch 'origin/master'

Conflicts:
	omod/src/main/resources/webModuleApplicationContext.xml