Replace use of jQuery in special event setup with dollar
Merge branch 'develop'