added support for resource on xml and json set string
Merge remote-tracking branch 'origin/master'