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