Added temporary fix for issue with story being null when creating intent for sending to Add Choice Activity.
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08

Conflicts:
	Team08StoryApp/res/layout/header_search.xml

Merged conflicts.