Added Popcorn.js to the project,
 included new timeview app,
 updated homepage with an example timeview footnotes
Began model for timelike objects.
Moved content from based.html to home.html
Merge branch 'dev'

Conflicts:
	basePages/templates/basePages/home.html
	html5test/settings.py
	templates/base.html

fixed conflicts
Fixed some more conflicts