Merge branch 'master' into gh-pages

Conflicts:
	src/w5cValidator.js