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 #185 from iameric1986/master

Added all the local load methods and generalized them
Added more tests for DataManagerTest
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty
Merge pull request #186 from iameric1986/master

Changed logic for saving functions in post controller
Made changes to make tests work
Merge pull request #187 from cchan5/master

Updated DataManagerTest
All tests for caching now work
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.