Questions and categories linked on client side and this shows up in the database. Expanded rows for question details showing answers, etc. No validation yet but this can at least be remedied by deleting questions and re-adding if necessary. Done with this for time being.
Merge remote-tracking branch 'origin/collab_quiz' into collab_quiz

Conflicts:
	3rdPartyServices/StudentServices/CollaborativeQuiz/SocialLearningServer/src/main/webapp/categorylist.xhtml
	3rdPartyServices/StudentServices/CollaborativeQuiz/SocialLearningServer/src/main/webapp/questionlist.xhtml