Refactoring builtin help
Refactoring of Built-In help completed
Merged my changes with Alice's changes
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08

Conflicts:
	Team08StoryApp/res/values/strings.xml
	Team08StoryApp/src/com/team08storyapp/EditFragmentActivity.java
	Team08StoryApp/src/com/team08storyapp/NewStoryActivity.java
More merges with Alice's changes
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08

Conflicts:
	Team08StoryApp/src/com/team08storyapp/EditFragmentActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08