add display_order to priority_types and status_types

by kim to, 31/08/2014
Merge remote-tracking branch 'origin/Kim'

By Yang
31 Aug 2014
Merge remote-tracking branch 'origin/master' into Matt