mine works, i think
Merge branch 'master' of github.com:crantila/vis

Conflicts:
	controllers/importer.py