half work again
Merge branch 'master' of git@github.com:liubida/SohukanHealth.git

Conflicts:
	SohukanHealth/monitor/views.py