Merge branch 'master' into t6_widgets
ticket:6 rework of veiws.py and some corrections in widgets.py
Merge branch 't6_widgets'