Code cleanup
Merge branch 'develop' of github.com:moderntribe/the-events-calendar into develop