timeline start
Merge branch 'master' into timeline

Conflicts:
	main.tpl

finished commit
Added lightbox style popup, started adding timeline data, fixed a few bugs
finished timeline popup
switched to minified version of timeline