ticket:13 add index, fix model style
Merge branch 'master' into t13_priority_field
Merge branch 't13_priority_field'