Added Cached: in front of any story which is saved locally
#135-Fixed Added Cached infront of localy stored stories
#136 Half working functionality of cache and upload - currently stackoverflow GSon errors
#136 **Incomplete - STACKOVERFLOWERROR when calling ESHandler Update, and with DBHandler add new story
#135-Added Cached before Local Story
Merge branch 'master' of https://github.com/tbendubois/301project
Fixed logic for caching, still not working
Fixed caching and saving a handler within story
Merge branch 'master' of https://github.com/tbendubois/301project into caching

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
DBHandler tests now all pass
Merge branch 'master' of https://github.com/tbendubois/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
added some screen refreshing, fixed some handler issues
Merge branch 'master' of https://github.com/tbendubois/301project into caching

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge pull request #1 from klindenbach/caching

Caching
Removed .settings
Merge =/
Merge
Merge =/
Merge branch 'master' of https://github.com/tbendubois/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java