convert security to dict
small fix
tiny fix
add access control for questionnaire
Merge branch 'yangsiy' into dev