Merge pull request #1 from SpinelStudio/master

Merge Repo
Merge pull request #2 from SpinelStudio/master

Add template : 'sciences.html'. Fix bugs.
Merge branch 'master' of https://github.com/SpinelStudio/ss-cms-dianzi
Merge branch 'master' of https://github.com/SpinelStudio/ss-cms-dianzi
Merge branch 'master' of github.com:Junzki/ss-cms-dianzi
Update root template
Merge branch 'master' of https://github.com/Junzki/ss-cms-dianzi

Conflicts:
	static/css/base.css
Fix base.html
Add template 'article.html'
Fix a bug
change
Module 'article' complate
Merge https://github.com/Saracadivesleaf/ss-cms-dianzi into Saracadivesleaf-master

Conflicts:
	_db/dianzi.db
	science/views.py
Merge Saracadivesleaf-master, fix bugs, Add data.
Merge branch 'Saracadivesleaf-master'