news and events categorization
Merge branch 'master' of ssh://github.com/Spoken-tutorial/spoken-website

Conflicts:
	spoken/views.py
	static/spoken/templates/news/index.html