test
Merge remote-tracking branch 'origin/master'

Conflicts:
	js-sandbox/.settings/org.eclipse.wst.jsdt.core.prefs
	web-study/.settings/org.eclipse.core.resources.prefs
	web-study/.settings/org.eclipse.wst.jsdt.core.prefs