add username to addUser function
fixed dashboard list user
Merge branch 'feature/mam-mdm-merge' of github.com:wso2-dev/product-emm into mam-mdm-merge
fix permissions
Merge branch 'develop' of github.com:wso2-dev/product-emm into mam-mdm-merge

Conflicts:
	modules/apps/emm/api/userRouter.js
	modules/apps/emm/config/config.json
	modules/apps/emm/modules/driver.js
fix internal role issue
Changes to permission.js
add changes to permission.js
Merge branch 'mam-mdm-merge' into develop