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

Conflicts:
	.idea/workspace.xml
Merge branch 'mdm-scratch' of github.com:WSO2Mobile/mdm into mdm-scratch
merging