UML Cleanup
Merge branch 'master' of https://github.com/CMPUT301F14T11/TEAMLORT

Conflicts:
	Project/src/com/github/cmput301f14t11/teamlort/elasticmanager.java
Merge branch 'master' of https://github.com/CMPUT301F14T11/TEAMLORT

Conflicts:
	Project/src/com/github/cmput301f14t11/teamlort/Qlistcontroller.java
	Project/src/com/github/cmput301f14t11/teamlort/QuestionViewActivity.java
	Project/src/com/github/cmput301f14t11/teamlort/elasticmanager.java