implement context scrubber
fix context axis
resolve merge conflict in main.js
Merge pull request #59 from thelac/24

implement context scrubber