fixed bug where app was crashing when publishing a story
all photos and illustrations merged in activity
Merge branch 'JoshWork'
Merge branch 'master' into JoshWork