Add footnotes to some slides
Merge desktop and android slides
update notes
Merge branch 'master' into gh-pages