added a page for editing existing mewaps
merge conflict fix
Merge branch 'master' of github.com:raksooo/meWap