Added markers to the Story page
Merge remote-tracking branch 'origin/master'