Merge branch 't5_edit_page'
Merge branch 't5_edit_page'
Merge branch 't5_edit_page'
ticket:5 some additions to previous commit
ticket:5 returning of all templates
Merge branch 'master' into t6_widgets
ticket:6 rework of veiws.py and some corrections in widgets.py
Merge branch 't6_widgets'
Merge branch 'master' into t5_edit_page
ticket:5 settings.LOGIN_URL change for correct url