Merge branch 't5_edit_form'
Merge branch 'master' into t3_http_storage_middleware
ticket:3 Moved template files to single directory
ticket:3 Fixed 'The STATICFILES_DIRS setting should not contain the STATIC_ROOT setting' error
ticket:3 Modified templates, requests now display contacts info
Merge branch 't3_http_storage_middleware'
Merge branch 'master' into t5_edit_form