trapHandler
Added trap geometry xml
Merge branch 'edfarina-uno'
Merge remote branch 'upstream/master'
added cgs boolean solid
fixing conflicts in edoardo uno branch before merging
Merge pull request #18 from clementhelsens/edfarina-uno-fix2

Edfarina uno fix2