Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
add pdf version of slide
Merge branch 'master' into develop