Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	rest/lessons1.json
	rest/videos1.json
Adding web developer skills minilecture