Merge pull request #10 from CMPUT301F14T03/master

updating fork
Merge pull request #11 from CMPUT301F14T03/master

updatefork
Merge pull request #12 from CMPUT301F14T03/master

asdfasfgasfgas
Merge pull request #188 from cchan5/master

All tests for caching now work
Merge pull request #13 from CMPUT301F14T03/master

adgdagadgad
Merge branch 'master' of https://github.com/tbrockman/lotsofcodingkitty
test compile again
Merge pull request #189 from tbrockman/master

Fixed errors in test cases
copied more code that will be needed later for server
Merge pull request #190 from tbrockman/master

copied more code that will be needed later for server and deleted an unused test file
The mock server has functionality and loads to the main screen.  Also integrated some of the save functions to the main activity.
Merge pull request #191 from iameric1986/master

The mock server has functionality and loads to the main screen.  Also in...
More mock server stuff
got comments to work for Question and Answers
got counts to work for both answers and questions
Merge pull request #192 from jivedesign/master

Got commetns and their counts to work for Questions and Answers
Merged with Josh's changes
added some meta data to comments view
Mock server changes
Merge pull request #193 from jivedesign/master

added some meta data to comments view