fix some bugs.
fix some bugs.
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/base.html
	upcms/settings.py
	upcms/urls.py