-- Refactored main.js to extract out getEvents functionality
-- Rearranged the code
-- reverted the refactoring for active events in main.js to fix the breaking active events comparison
Merge branch 'refactorMain'

Conflicts:
	main.js