Merge pull request #14 from simdugas/simon

fixed #12 fixed #13
adding cleaned up functionality to data import
Merge branch 'master' of https://github.com/simdugas/childcare into rickey

Conflicts:
	controllers/dataadmin.py

Merging to master branch
fixing conflicts
Merge pull request #17 from simdugas/simon

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

form in sidebar
Merge branch 'master' into simon
Merge pull request #19 from simdugas/rickey

Merge pull request #18 from simdugas/master
Merge branch 'master' into simon