merging
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into milestone6
test git
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into milestone6
test git
devices changes
addded error messages
Merge branch 'milestone6' into alpha1