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