* commit by bmr from IJ 12
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/Test.js