Merge pull request #2 from coreyjamison/questionview

Questionview
added comment section to getView() of QAbodyAdapter
fixed a problem with last commit

last commit:54336ffb4456a757c641b31102e9163abc780443
Cleaned up Adapter and added methods

I cleaned up/changed some the additions I had for the getView method of
the QA adapter. I also added some methods for adding QABody items
(Answers) and adding comments to the QABody items.
Added QuestionListActivity basic functionality
Added QuestionListActivity basic functionality
Added comments and TODOs according to specification.
Merge remote-tracking branch 'origin/master'

Conflicts:
	moqa/AndroidManifest.xml
	moqa/res/values/strings.xml
	moqa/src/com/ualberta/team17/view/QuestionListActivity.java
Removing things for merge

Corey also has these functions but mine don't work in the way we decided
will be best.
fixing conflicts, PR from master
Moved inner classes
Merge pull request #61 from joelkeeling/Sprint-1

Implemented Comments QuestionViewActivity
Merge pull request #58 from j-rewerts/master

Added QuestionListActivity basic functionality
Merge pull request #62 from stravant/master

Added JavaDoc comments to IncrementalResult Related Stuff
Added two missing files.
Added two missing files.
Merge branch 'master' of https://github.com/j-rewerts/Team17Project
Added actions menu.
Merge pull request #68 from j-rewerts/master

Fixed my last PR
Fixed test project manifest so it looks for the right package