ticket:1 The rule syncdb in Makefile was changed and templates moved to their correct place.
Merge branch 't1_contacts'
Merge branch 'master' into t3_requests
ticket:3 templates was moved to correct place
ticket:3 templates was moved to correct place (second attempt:) )
Merge branch 't3_requests'
Merge branch 'master' into t5_edit_page
ticket:5 interim commit