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
Changes to apis json to change permission api url
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
Fixing issue in dual publisher
Added unit tests for user module
Merge branch 'feature/unit-tests' into develop
Fixed the issue in naming and added comments
Merge branch 'develop' of github.com:wso2-dev/product-emm into develop
Changes to permission.js
add changes to permission.js
Merge branch 'mam-mdm-merge' into develop
Merge branch 'develop' into feature/mam-mdm-merge

Conflicts:
	modules/apps/emm/config/apis.json
fix permission evaluation
Merge branch 'mam-mdm-merge' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'develop' into feature/mam-mdm-merge
changes to policy module