Merge remote-tracking branch 'origin/master'

Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$2.class

	App/bin/classes/ca/ualberta/app/activity/FragmentMain$DeleteThread.class

	App/bin/classes/ca/ualberta/app/activity/FragmentMain$SearchThread.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain.class

	App/bin/classes/ca/ualberta/app/activity/FragmentSearch$SearchThread.class
	App/bin/resources.ap_

	AppTest/bin/classes/ca/ualberta/app/activity/test/SearchQuestionContentTest.class
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	App/bin/resources.ap_