add attachemnt and history
create seed for task status
resolved conflict
resolved conflict
fixed bootstrap icon issue