Updated AddPictureToAnswer
Merge branch 'master' of github.com:CMPUT301F14T05/CorgFu

Conflicts:
	App/res/layout/activity_view_question_and_answers.xml
	App/res/layout/activity_view_question_and_replies.xml
	App/src/ca/ualberta/cs/corgFuViews/ViewQuestionAndAnswers.java