Added MADlab event
Added Altera
fixed the MADLab event
Merge branch 'master' into draft