ticket:6 fix
collectstatic
ticket:6 collectstatic
Merge branch 'master' into t6_widget
ticket:6 fix widget