Update root template
Merge branch 'master' of https://github.com/Junzki/ss-cms-dianzi

Conflicts:
	static/css/base.css