18Dec branch C added property
Merge branch 'branchC' into branchB

Conflicts:
	brC_added.properties
Revert "Merge branch 'branchC' into branchB"

This reverts commit 6aad89ba25674385876be4b2b9235ff3d7cb7bf2, reversing
changes made to 3ae4e604a03613cb0bd47cc39e7ed8612d37a5f9.