Updated dto's and ConvertEntities
Merge pull request #63 from teugis/master

Updated dto's and ConvertEntities
Merge remote-tracking branch 'upstream/master'