changes after sync with frank
Merge branch 'master' of https://github.com/frankyanwang/SmartRead

Conflicts:
	data_store/config.js
	data_store/feedinsert.js
	server/db-provider.js
	server/db-settings.js
Merge branch 'master' of https://github.com/frankyanwang/SmartRead
Added content filter
Merge pull request #15 from madimalo/master

Added content filter
Enhance feed insert to get more stories
Merge remote-tracking branch 'upstream/master'
Fixed Mongo db connection doesn't close issue. Because when we run cron job, we don't need auto connect to be true, which reconnect to mongo db. Also fixed a URL malware bug.
Error handling when connection failed to open.
Set request parameter and timeout 60sec
more error handling and error logs.
Merge remote-tracking branch 'upstream/master'
update initial score and tags