Prevent Parent from stopping map view from being scrolled
Merge commit '15c45aae109e9080bad6bd71f6acc5aa4d792340'

Conflicts:
	README.md