merged from head
Updated TODO's as well as commenting

Went through files and ensured that they are javadoc commented. Also
came across some errors and marked them with todo's.
Fixed manager to not hit DB excessively

StoryManager used to hit the DB for every operation, will not scale once
we have web as well. Story manager is now using a caching system.
However, refactoring required adjusting the listeners and views.
Fixed bug in DB

Database was not populating fragment list when loading in stories. It
does this now. Also fixed a bug with the getAllFragments based on
storyid. Broken loop + bad lookup.
merge from james branch
Merge branch 'james'

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IBookmarkListListener.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryListListener.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryModelDirector.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Merged in branch to master
merge from head
Fixing more merge issues

View's had business logic and were bypassing the controllers. Fixed
that. Also fixed some bad merges.
Merge pull request #65 from jesseDtucker/master

Redo of previous pull request. Database and model update