Add Question fragment and button connected
Merge pull request #81 from stephenjust/master

Fixing broken test
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project

Conflicts:
	QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/MainActivity.java
Merge pull request #82 from lamorie/addQuestion

Add Question fragment and button connected
Added update main list
Added list adapter
Added onclicklistener
added question to click listener
maybe fixed travis?
added intent
Merge pull request #83 from Kopo101/QuestionListAdapter

Added update main list
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into ClickQuestionItem
question view opens on item click
Merge pull request #84 from Kopo101/ClickQuestionItem

Click question item
I am being harrased, please ask the machine to stop.
Merge pull request #85 from RyanKusters/NewStuff

I am being harrased, please ask the machine to stop.
added listener for answer item
AnswerViewActivity

Added AnswerView activity. Re-instated dummy menu items. It will need
updating later once we start displaying the upvote tally. Also,
addcommentdialogfragment needs to call an update() like in the
addAnswerDialogFragment.
Merge pull request #86 from Kopo101/answerActivityListener

added listener for answer item
Merge pull request #87 from linster/master

AnswerViewActivity