First try at answering questions
Merge branch 'createAnswersView'
Merge branch 'master' into createShowQuestionsView