Merge branch 'nnn' into temp

Conflicts:
	examples/webgl_morphnormals.html
	src/animation/tracks/BooleanKeyframeTrack.js
	src/animation/tracks/ColorKeyframeTrack.js
	src/animation/tracks/NumberKeyframeTrack.js
	src/animation/tracks/QuaternionKeyframeTrack.js
	src/animation/tracks/StringKeyframeTrack.js
	src/animation/tracks/VectorKeyframeTrack.js