commit
Merge branch 'master' into mw_branch
commit
commit
commit
commit
commit
Merge remote-tracking branch 'origin/mw_branch'

Conflicts:
	DragonQ/app/src/main/java/com/dragonq/dragonq/QuestionView.java
	DragonQ/app/src/main/java/com/dragonq/dragonq/Questions.java
	DragonQ/app/src/main/res/layout/activity_question_view.xml