add delayed time for twitter
Merge pull request #33 from caok/master

Crawl when has image
update price color
Merge branch 'master' of https://github.com/xiongbo/EST.INFO

Conflicts:
	lib/crawler/dgtle.rb
	lib/crawler/feng.rb
	lib/crawler/macx.rb
add entry image handle logic and optimize some code
update en_images
update nginx.conf
update deploy.rb