ticket:1 add models and templates
ticket:1 Merge branch 't1_nethen'