Merge branch 'gh-pages'
Youtube, still need mashups not saved because not working properly
Merge branch 'master' into gh-pages