QuestionViewActivity tests
Merge remote-tracking branch 'origin/question_view_refactoring' into question_view_refactoring

Conflicts:

	halfcaff/src/com/ualberta/team17/view/test/QuestionViewActivityTest.java
removed bad comment
Merge pull request #148 from coreyjamison/question_view_refactoring

Question view refactoring
Merge branch 'pr/2' into question_view-design