Merge branch 'mmukai-master'
fix the function of replace html at Survey