view for conflict
Add dto and facade logic
 add some logic
merged with develop
add conflict.js
add find moderator logic
fixed bug
fixed bug
fixed bug
merge with develop
fixed bugs
add constants to js
merged with develop
Merge pull request #127 from if045/IFJJV-154-IN-Create-conflict

Ifjjv 154 in create conflict