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