Merge Zan_branch into editcontestant