Resolving conflicts
Merge branch 'master' of github.com:WSO2Mobile/MDM-Android-Agent