ticket:1 STATICFILES_DIRS fixes
ticket:1 HTML fixes
Merge branch 't1'