store page
resolved events feed conflicts
Merge pull request #299 from RyanTG/master

store page