JUnit test for TenderServiceFacadeImpl.mapCategory() method
Merge branch 'develop' into IFJJV-YM-JUnitTest
integration test
fixed bug with pom.xml
Merge branch 'develop' into IFJJV-YM-JunitTest
integration test for satender method
pagination and search on moderator conflict tab
added status column to conflicts table
added sorting
integration test for saveTender method
Merge pull request #182 from if045/IFJJV-YM-JunitTest

Ifjjv ym junit test
Merge pull request #176 from if045/YM-tech

pagination and search on moderator conflict tab
Resolved conflicts