Fix critical bug: conflict with Question and Choice data
Merge branch 'ver._1.0' of https://github.com/alex-kr/cf-project into ver._1.0