Admin updates
Merge branch 'google_apps' of github.com:pfletch1023/Gandalf into google_apps
event stles
Merge branch 'google_apps' into calendar