本地适应性修改
Merge branch 'master' of https://github.com/dragonly/scrapy_tianya into local
Merge remote-tracking branch 'origin/master' into local

Conflicts:
	tianya/spiders/tianyaSpider.py
Merge remote-tracking branch 'origin/master' into local
Merge remote-tracking branch 'origin/master' into local
Merge remote-tracking branch 'origin/master' into local

Conflicts:
	tianya/settings.py
[Fix] urls?params, now check item['urls'] in db..urls without params