ticket:13 changed models to be able to edit them in admin
Merge branch 'master' into t_13_understanding
ticket:9 small fix
Merge branch 't_9_command_listmodels'
Merge branch 't_13_understanding'