Merge pull request #4 from CMPUT301F14T17/master

merge with master
Added a popup dialog when the view is created without an id passed in on
the intent. Still need other things implemented before it does anything
though.
create answer button and listener
merged changes from main repo
Stopped a NullPointerException that was happening with the newest
changes
Merge remote-tracking branch 'joel/Adding' into joel-adding

Conflicts:
	moqa/src/com/ualberta/team17/view/QuestionViewActivity.java
fixing things post merge
Merge pull request #5 from CMPUT301F14T17/master

Merging with master
commit at the end of the night
pre-merge with master
Merge with master
linked viewing question page functionality

hopefully this works!
touch ups for implementing the View page
Merge pull request #7 from CMPUT301F14T17/master

merging with master
Merge branch 'Adding' of https://github.com/joelkeeling/Team17Project into Adding
Merge pull request #8 from CMPUT301F14T17/master

merging with master
Integrated Question page view
Merge branch 'Adding' of https://github.com/joelkeeling/Team17Project into Adding
Fixing comment display
Merge branch 'master' of https://github.com/CMPUT301F14T17/Team17Project into CMPUT301F14T17-master

Conflicts:
	moqa/res/values/strings.xml