added PropertyMergeService
Merge branch 'master' of github.com:gxa/atlas