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