support multiple event in json
Merge branch 'master' into dev-multievent

Conflicts:
	lib/route.js
	lib/wiki.js
do not load cached json from fs

load from http to utilize merged timeline data
for multi event
get key of page to render from routing rules

support multi event with 'foo+bar' keys
save wikiArticles field in index.json
render multi event page
add cache for json
Merge branch 'dev-multievent'