Merge branch 'master' into gh-pages
Moved Assets
Merge branch 'gh-pages'