Merge pull request #13 from jnovotny/master

composite template DTOs, fix for CustomFields
Merge pull request #1 from techblue/master

Merge pull request #13 from jnovotny/master