added MultiAnswerMultipleChoice class. still need full implementation into website.
fixed conflicts