merget AnswerView
Merge branch 'master' of https://github.com/holgersentversnes/OL2014