view for conflict
Add dto and facade logic
 add some logic
Units sorting
merged with develop
add conflict.js
Deals List pagination backend
Fixed bug
add find moderator logic
fixed bug
fixed bug
fixed bug
Deals List pagination frontend
Add mail sender
Fix some bugs and add constance
Merged with develop
Fixed bug
Fixed bug
merge with develop
fixed bugs