Merge branch 'master' of ssh://hammerboy/home/lincoln/pessoal/eventmanager