ticket:4 redo task int the right way
ticket:4 settings changed to serve static
ticket:5 fix conflicts after merge with t4_settings
ticket:5 migrations for hello app added
ticket:5 image path removed from the home page
Merge branch 't5_edit_data' into t6_datepicker
Merge branch 't6_datepicker' into t8_templatetag