first work on merge
load scripts
more merge
moved startup into boot.js
almost there!
almost there!
somewhat working!
completly working!? seems like it! there must be something wrong.....
almost ther1!
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)
huge bugs in merge, I think related to load order
ahh, much better. mostly working
merge
merge development
fix missing childAdded call
trying to stay somewhat up to date
fix avatar choice dialog
merge development