test
Merge branch 'permission2' of github.com:WSO2Mobile/mdm into permission2

Conflicts:
	themes/wso2mobile/css/main.css
merging