validation fixed (form name|id conflict)
search by user Roles
Merge remote-tracking branch 'origin/Develop' into Develop