Show answers fixes
Merge branch 'show-answers' of https://github.com/icplayer/icplayer into show-answers