Fixing context
Fix for reviews
Merge branch 'beta1' of https://github.com/WSO2Mobile/mobilestore into beta1