make question fixed
Merge remote-tracking branch 'origin/feature/question' into feature/question

Conflicts:
	assets/styles/question.css