Updated events.
Merge branch 'static' of github.com:hasgeek/hasweb into static

Conflicts:
	hasweb/templates/index.html