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

Conflicts:
	client/js/permissions/add_bundle.js