Map and Webview added .
Conflicts fixed