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

Conflicts:
	controller/permissions.js
	pages/1-column.hbs