Update to Controller
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/src/com/brogrammers/agora/QuestionController.java
Modifying Answer Activity to avoid duplicating answers/questions
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/src/com/brogrammers/agora/AnswerActivity.java
	Agora/src/com/brogrammers/agora/MainActivity.java