Refactored Trap.js and options.js for better Trap-Handling
Merge remote-tracking branch 'origin/trapManager' into trapManager