Merge branch 'develop' into IFJJV-136-RS-AddTenderUI
Created deal button
Created deals.jsp and controller redirect logic
Fixed deals table
Added search field
Merge branch 'develop' into IFJJV-70-RS-MyDeals
Merged with develop
Fixed bugs
Fix double categories
Change price type, and categories type
Fix some entity repository
Fix resize for textarea(description)
Fix label for units table and add column for bids count
Replace description for proposal
Remove column Measurement
Resolve conflicts
Resolve conflict
Fixed search button on mydeals page
Moved js to deals.js
Merged with develop