Removed lags in chai3d
Remove lag again
Fixing merge conflicts
Correcting merge conflict