Merge branch 'master' of git://hammerboy.no-ip.org/eventmanager