ticket:6 static files placed inside corresponding apps
Merge branch 't6'