renamed beans, exlude Basic part in name
Merge branch 'development' of https://github.com/engagepoint/labs-questionnaire-template.git into development