updating choice elements
Merge branch 'master' of https://github.com/HCMID/hmt-iliad11