JK-30 activation model
 -add activation model
Merge remote-tracking branch 'origin/develop' into develop
JK-35 Mail Design and Bug-Fix
  - fixed mail_come_shipping.html
  - fixed mail_vote.html
  - fixed mail_send_shipping.html