Adding Laser shape with UV mapping, moving some objs
Merge remote-tracking branch 'origin/master'