conferences added
A slightly revised version of Albert's Slides added
Merge branch 'newdevelop' into workbench