Merge changes from upstream.

 Changes to be committed:
add story crud module
Merge pull request #1 from jesmith14/master

Merge changes from upstream.