Added timeout and request error exit
config
Merge branch 'master' of https://github.com/frankyanwang/SmartRead

Conflicts:
	data_store/feedinsert.js
Merge branch 'master' of https://github.com/frankyanwang/SmartRead
Merge pull request #17 from xiatao123/master

initial score and tags integrate(need to fix encode issue)
Use Javascript native date in long.
Merge branch 'master' of https://github.com/frankyanwang/SmartRead
Remove modal popup.  If we want it back, we can set SR.NO_POPUP = false; which will check content of the story. If content is not empty, we show popup.
use time ago in Chinese and display in UI.
Added image url check.
Merge branch 'master' of https://github.com/frankyanwang/SmartRead

Conflicts:
	data_store/feedinsert.js
Added xmlhttprequest
Merge pull request #18 from madimalo/master

Added image url check
Add another time.
change to user from userName to be consistent
Only open one db connection pool for each RSS source and close afterwards. Also insert tags and categories into story table.
Fixed an issue.
add java to run udpate top stories