modify the activity
Revert "modify the activity"

This reverts commit 84d90dca97d68e6ba40fd16dd743d3cfdff79b22.
modify interface for a single question
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter.class
	App/bin/classes/ca/ualberta/app/models/InputListManager.class
	App/bin/resources.ap_