Fix Bug 880577 - Initial merging of webmaker.org/events work from Amoeba