home commit
修复模板文件
csrf
"ajax csrf"
Merge branch 'master' of https://github.com/paddypei/projects

Conflicts:
	blog/__init__.pyc
	blog/settings.py
	blog/settings.pyc
	blog/urls.py
	blog/urls.pyc
	blog/wsgi.pyc
	books/__init__.pyc
	books/admin.py
	books/admin.pyc
	books/migrations/0001_initial.pyc
	books/migrations/0002_auto_20141217_1717.pyc
	books/migrations/__init__.pyc
	books/models.py
	books/models.pyc
	books/static/js/modernizr.js
	books/urls.py
	books/urls.pyc
	books/views.py
	books/views.pyc
	contact/__init__.pyc
	contact/admin.pyc
	contact/migrations/__init__.pyc
	contact/models.pyc
	system/__init__.pyc
	system/admin.pyc
	system/migrations/0001_initial.pyc
	system/migrations/__init__.pyc
	system/models.pyc
	todo/__init__.pyc
	todo/admin.pyc
	todo/migrations/0001_initial.pyc
	todo/migrations/0002_auto_20141216_1122.pyc
	todo/migrations/__init__.pyc
	todo/models.pyc
	todo/urls.pyc
	todo/views.pyc