Merge branch 'master' into gh-pages
updated projects
resolved merge conflict