add validation on conflict and feedback page
Merge pull request #151 from if045/IN-tech

add validation on conflict and feedback page
fixed data base
fixed backend classes
fixed frontend code
Merge pull request #152 from if045/SK-tech

Sk tech
Merge branch 'develop' into IFJJV-166-RS-DealListSorting
Fixed bug