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
AuthorStories and AuthorDescription load from Model
AuthorController in Locator
AuthorEdit_Edit is now godlyish
AuthorEdit_Preview more godly
Preview and Edit get data from model
Got rid of fragment shit in AuthorStoryDescription
Reimplmented menu bar
Added stuff to StoryManager for bookmarks
Started implementing Create New Story
Set default bitmap for Story when saving.
Minor adjustments
Initial UserControllerTest
Making shit pretty
View UML
Merge branch 'master' of github.com:CMPUT301F13T03/adventure.datetime into authorshit