chinatimes_realtime
Merge branch 'master' into algo

Conflicts:
	Controllers/curl.js
	scrawler_for_apple_search.js
chinatimes_search
rename for misnomer
Merge branch 'branchk' into dev
Get ettoday's news
Revise
test_column for tag,news,and content
Merge branch 'branchk' into dev
rewrite for column
Merge branch 'branchk' into dev
Add timeglider
timelineJS reference to https://github.com/NUKnightLab/TimelineJS
Merge branch 'layout' of https://github.com/m80126colin/NewsLine into layout
Merge branch 'layout' into dev
remove timeglider
Change name
change name
change name too
QQ