fixing conflicts
fixed the geolocation loading and map renderw
Merge pull request #17 from simdugas/simon

fixed the geolocation loading and map renderw
Merge pull request #18 from simdugas/master

form in sidebar