Merge branch 'master' into t5_edit_page
ticket:5 settings.LOGIN_URL change for correct url
Merge branch 't5_edit_page'