Revert "Commiting so I can test something else."

This reverts commit d81aab991743286193af3087468d181b75ecd045.
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryModelDirector.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryModelDirector.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Added stuff to StoryManager for bookmarks
Set default bitmap for Story when saving.
Minor adjustments
Initial UserControllerTest
Sick of these goddamn hyphens in my goddamn app
W/ Preview
Revert "W/ Preview"

This reverts commit 32f7a55ebda9510f8bb4c68ee4e049cf0964b78a.
Preview
Maybe if we included the visio file as well... :/
Small modifications based off Jesse's feedback
Taking out logging I missed
Merge pull request #59 from edegraff/bookmark

Bookmark Stuff
Merge pull request #60 from Jtfinlay/master

UML View update! With a preview!
Merge branch 'Docs' into ControllerDoc
Updated ALL THE UML