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

Conflicts:
	themes/wso2mobile/css/main.css
merging
merging
merging
user config filter
merging
Merge branch 'permission2' of github.com:WSO2Mobile/mdm into permission2
added group type
changes to admin type
changes
commited configuration changes
users roles for devices
merge
Merge branch 'permission2' of https://github.com/WSO2Mobile/mdm into permission2
merging
Merge branch 'permission2' of github.com:WSO2Mobile/mdm into permission2
merging
merging
merging