Added event locations and text colour changing
Merge branch 'master' into proxy