added a new feed.
Merge branch 'master' of https://github.com/frankyanwang/SmartRead
Added more image forbidden sites
Merge branch 'master' of https://github.com/frankyanwang/SmartRead

Conflicts:
	data_store/config.js
Admin View/Edit
Merge branch 'master' of https://github.com/frankyanwang/SmartRead
Fixed the tags error, now it will be updated as array.
Merge pull request #35 from xiatao123/master

Extract hot tags from Sogou and Baidu
Merge pull request #36 from madimalo/master

Admin View/Edit
Updated tags and display 120 characters.
Merge pull request #37 from madimalo/master

Tags and 120 characters
Merge remote-tracking branch 'upstream/master'