removed light-3d style
Fixed duplicate class
Merge branch 'master' into unstable