Initial mix reflection
Merge remote-tracking branch 'origin/development' into mix-shader

Conflicts:
	support/client/lib/vwf/model/threejs/materialDef.js
Refactoring in progress (UNSTABLE)
Merge remote-tracking branch 'origin/development' into mix-shader

Conflicts:
	support/client/lib/vwf/model/threejs/materialDef.js
fix debugger message
Correctly patch mix shader code into phong shader
Reorganized mix shader code to be more efficient
Merge branch 'mix-shader' into development

Conflicts:
	support/client/lib/vwf/view/editorview/Editor.js
merge up dev