changes to permissons
Merge branch 'mdm-dev' of https://github.com/WSO2Mobile/mdm into mdm-dev

Conflicts:
	controller/permissions.js
changes to permission
change to permissions