DBConnection Exception
Merge remote-tracking branch 'origin/master'

Conflicts:
	crawler/database.py