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

Conflicts:
	views/console/dashboard.hbs
merging
merging