fixed email and role permission issue
Fixed issue in "Devices by OS" graph in dashboard
Merge branch 'develop' of https://github.com/wso2-dev/product-emm into develop

Conflicts:
	modules/apps/emm/sqlscripts/db.js