added Discover Event button on navigation
added Discover Event button on navigation and merged conflicts