moved classes from LayoutDemo to pckgs Notes and Slides
Merge remote-tracking branch 'origin/master'