modal add and edit
Merge branch 'beta2' of github.com:WSO2Mobile/mam into beta2