Test 1
Add proposal mapping
Mapped full proposal
Method for mapping list of objects
Add convertible class
Modified utilMapper
Replace mapProposal
Add tender mapping into tenderDto
Add unit mapping to unitDto
Add mapping for Category into CategoryDto
Add mapping for Conflict to ConflictDto
Add Feedbackmapping to FeedbackDto
Merge branch 'develop' into IFJJV-192-KM-CreateConvModelMapper
Resolve conflicts
Modified code
fixed bug
Merge pull request #181 from if045/IFJJV-192-KM-CreateConvModelMapper

Ifjjv 192 km create conv model mapper