Added left and right margin on multichoice answers
Merge branch 'master' into api-1.1