Merge branch 'develop' into RS-tech
Merge branch 'develop' into RS-tech
add real-user id to feedback
Adapted deals list pagination for security.
Add current user for create proposal
Add real customer into DB and modified mail notification
Merge branch 'develop' into IFJJV-167-IN-Add-security-integration
Resolved conflicts
refactor some code, and create confirmation for update tender
fix security to action button on TendersHome page
fix some bug
fix some empty field
change some logic
Merge pull request #138 from if045/RS-tech

RS-tech
Merge pull request #140 from if045/KM-tech

Km tech
Merge pull request #141 from if045/YM-tech

refactor some code, and create confirmation for update tender
Merge pull request #143 from if045/IFJJV-167-IN-Add-security-integration

Ifjjv 167 in add security integration
add security