refactoring
ticket:3 refactoring
refactoring
refactoring
refactoring
refactoring
Merge branch 't4_context-processor' into t5_edit

Conflicts:
	django_hello_world/hello/static/css/bootstrap-responsive.css
	django_hello_world/hello/static/css/bootstrap.css
	django_hello_world/hello/static/css/data_page.css
	django_hello_world/hello/static/js/bootstrap.js
	django_hello_world/hello/templates/base.html
	django_hello_world/hello/templates/hello/home.html
	django_hello_world/hello/tests.py
	django_hello_world/hello/views.py
	django_hello_world/static/css/data_page.css
	django_hello_world/urls.py
refactoring
ticket:5 refactoring
ticket:5 refactoring
ticket:5 fix some bugs
ticket:5 pep8
ticket:5 refactoring
ticket:6 fix some bugs