u
u
u
Merge branch 'master' of github.com:lyroge/Python-Scrapy.wenda.so.com

Conflicts:
	sitemap.py