Merge branch 'performanceOptimization' into 'master'

change loading strategy for questions w/ answeroptions

See merge request !15
4 jobs for master
in 5 minutes and 24 seconds and was queued for 2 seconds