Work On Nearby
Merge branch 'localist' of https://github.com/StudentLifeMarketingAndDesign/ac-json-events into localist

Conflicts:
	code/model/LocalistCalendar.php