updating the current events scope
Merge branch 'master' of https://github.com/msmilansky/Labradoodle into matthew

ý5:q
adding stuff so i can switch branches
deleted gmap.js, some other things