refactoring for tut
Merge branch 'master' of https://github.com/callenrain/agora

Conflicts:
	archives/urls.py
	archives/views.py
	db.sqlite3
db
urls
new view classes
Merge branch 'master' of https://github.com/justincosentino/agora

Conflicts:
	db.sqlite3
Merge branch 'master' of https://github.com/justincosentino/agora
fixed views for generic templates
fixed views for generic templates
Merge branch 'master' of https://github.com/justincosentino/agora
change video to a charfield
add pictures, presenter template