fixes
-cleanup
Merge branch 'master' into bgd-map

Conflicts:
	app/scripts/main.js
cleanup
cleanup
css
cleanup
cleanup
cleanup
added wikipedia entries + fictional entries injection + scroll from calendar
added absolute links in wikipedia entries
css
added internal link in fictional entry for test
Merge branch 'notebook' into ttb