update static setting
update log setting
resolve conflict
Merge branch 'master' of https://github.com/alecchyi/DjDemo

Conflicts:
	DjDemo/settings.py
	templates/header.html
	templates/sitebanner.html
update layout css and add blogs.html
update login page