added group, location
consistent formating to return event json object
add current month, next month