bug in activity html, need to fix
Merge branch 'master' of https://github.com/stanri/caesar-web

Conflicts:
	templates/dashboard/activity.html