fix merge conflict
Merge pull request #63 from arnaudbey/treeFix

cleanup js code, and add notification system