added new event manager short code
changed h1's to h2's on single event page
merge upstream
merge conflict