Merge pull request #356 from iameric1986/master

Offline functions should work now.  Syncing logic has been modified.
removed activity title TEXT
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty
Merge pull request #357 from jivedesign/master

remvoed activity title Text
Fixed the question sublist counter
Merge from master

Merge remote-tracking branch 'upstream/master'