Changed more strings.
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Valerie - Changed globalId to localId in the getRandomStory() method.
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder.git

Conflicts:
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/BrowseStoriesActivity.java
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/manager/StoryManager.java
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git