Continue
Merge branch 'master' of github.com:kislyuk/cartographer

Conflicts:
	load_db.py