formatted and edited question forms
Merge branch 'master' into frontend