Search Online placeholder implemented
Merge branch 'master' into search
Merge branch 'master' into search
Delay on requesting comments
Connecting search functionality
Merge remote-tracking branch 'james/search' into search
Search kind of works now
Updated UML to include WebView
Adding author story differentiation
UML update
View stuff for authored stories
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime into author

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/controller/AuthorController.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Possible fix?
Fixing merge conflicts
Merge remote-tracking branch 'source/pr/112' into author
Bug fix
merge from head
Merge pull request #113 from jesseDtucker/UML-Update

Uml update
Fixes #111
Fixed bug with autocorrect in text edit