Updates

General changes
update

gen
Merge branch 'master' of https://github.com/shjoshi777/tm-crawl

Conflicts:
	untitled folder/database_file3.py
	untitled folder/database_main.py
	untitled folder/settings.py
	untitled folder/storage6.py