LOW : prevent NPE
Merge branch '1.7.0' of ssh://git@github.com/openflexo-team/openflexo-core.git into 1.7.0
LOW : added code to concatenate ResourceCenters
Merge branch '1.7.0' of ssh://git@github.com/openflexo-team/openflexo-core.git into 1.7.0