update templates
fix display bug for conditional questions
update controller
Merge branch 'develop' of github.com:WebTales/rubedo into develop