Merge branch 'develop' into RS-tech
Merge branch 'develop' into RS-tech
Adapted deals list pagination for security.
Resolved conflicts
Merge pull request #138 from if045/RS-tech

RS-tech