ticket:1 added FIXTURE_DIRS to settings.py
ticket:1 added hello.urls.py
Merge branch 't1_profile_home'
fixed settings, urls
Merge branch 't3_middleware'
added new test for middleware
Merge branch 't3_middleware'
Merge branch 'master' into t4_context_processor

Conflicts:
	django_hello_world/hello/tests.py
	django_hello_world/hello/views.py
	django_hello_world/urls.py
Merge branch 't4_context_processor'
Moved context processor and middleware to hello application
Merge branch 't4_context_processor'
Moved context processor and middleware to hello application
Merge branch 't4_context_processor'
Merge branch 'master' into t5_auth_update_form

Conflicts:
	django_hello_world/hello/templates/hello/home.html
	django_hello_world/hello/urls.py
	django_hello_world/urls.py