check view html template
Merge branch 'master' of github.com:csy113/iems5718

Conflicts:
	event.py
Fixed errors
Merge branch 'master' of github.com:csy113/iems5718