change json_encode to Concrete5 helper ; change version package for correctly
Merge branch 'dev'

Conflicts:
	blocks/event_calendar/controller.php