ac-json-events update
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/after-class

Conflicts:
	themes/afterclass2/templates/Layout/LocalistEvent.ss