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
Modified createProposal
Remove user's possibility to create proposal to his own tender
Added roles and status columns
User profile link
Added ability to view users profiles for MODERATOR
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
Merge pull request #179 from if045/KM-tech

Km tech
Resolved conflicts
Merge pull request #180 from if045/RS-tech

RS-tech