Mergebranch

Infowindow is yet to be added. Except all functionalities are done and working.