appearance change
Merge branch 'master' of https://github.com/longfei-wang/mightyscreen

Conflicts:
	statistics/views.py