Changing listener names
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime into serverthing
Starting to connect WebStorage to StoryManager
Commiting changes so I can test pull request
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime into serverthing
Merge remote-tracking branch 'james/server' into serverthing

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IOnlineStoriesListener.java
Merge remote-tracking branch 'james/server' into serverthing
Adding onlineStoriesListener
First attempt at adding threading and async
Modifiying fragment retrieval from online
Added uploading of stories
Back to UUID instead of string
Whitespace
Whitespace2
Merge branch 'edegraff/serverthing' into server
TAGGGZ