Messing around with the question view xmls
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/res/layout/activity_question_view.xml