Email fix
Fixes for the primary coming in the username
Fix to the error
Merge branch 'beta1' of github.com:WSO2Mobile/mam into beta1
Merge branch 'beta1' of github.com:WSO2Mobile/mam into beta1