Merge branch 't4_context_processor'
Merge branch 't4_context_processor'
ticket:5 Tests
ticket:5 Fix tests
ticket:5 Fake initial migrate
ticket:5 Successfull migration
ticket:5 Login/logout
ticket:5 Edit page
ticket:5 Add templates
ticket:5 css and js
Merge branch 't5_make_editable'
ticket:5 Requirements
Merge branch 't5_make_editable'
ticket:3 Requirements
ticket:4 Fix tests
ticket:3 Fix tests
Merge branch 'master' into t3_middleware

Conflicts:
	requirements.txt
Merge branch 't3_middleware'
Merge branch 'master' into t4_context_processor

Conflicts:
	django_hello_world/hello/tests.py
	requirements.txt