added field to mark order as active order
Merge branch 'dev'