Fixing bookmark stuff
Fixed some Log.e's
Merge pull request #98 from jviau/master

Images, WebStorage ordering of list returned
Merge branch 'master' into bookmarkshit

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/controller/UserController.java
deleting log
Fixing bookmark timestamps
Removing log, for the last time.
Fixed #88
Merge pull request #103 from edegraff/bookmarkshit

Bookmarks fix Closes #96
Merge pull request #88 from afontaine/DBStuffz

Double loading of story fragments
Merge remote-tracking branch 'origin/master' into DBUpgrades

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryDB.java