merging
Merge branch 'mdm-dev' of github.com:WSO2Mobile/mdm into mdm-dev
Merge branch 'mdm-dev' of github.com:WSO2Mobile/mdm into mdm-dev
merging
merging
Merge branch 'mdm-dev' of github.com:WSO2Mobile/mdm into mdm-dev
merging
Merge branch 'mdm-dev' of github.com:WSO2Mobile/mdm into mdm-dev

Conflicts:
	controller/roles.js