geo events complete
Merge branch 'master' into new_events. need event selection hotfix
new level, new event
new font
Merge branch 'new_events'
Merge branch 'new_font'

Conflicts:
	src/js/config.js