Edit authenticate params
Add conditional statement for role management
Merge branch 'master' of github.com:abdollahpour/xweb