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
Fixes #111
Delete now deletes image from DB but doesn't delete view
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime into search

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/view/BrowseFragment.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/view/BrowseView.java
Removing random log
Merge conflict
Delete refreshes the view now
Heap change
I fixed a berg.
Merge branch 'master' of github.com:CMPUT301F13T03/adventure.datetime
Merge branch 'master' into fixes
Fixed conflicts
Merge pull request #120 from Jtfinlay/fixes

Fixes #118 and merges #111
Merge pull request #1 from jesseDtucker/edegraff-search

Edegraff search