some changes
new
Revert "some changes"

This reverts commit 6bc4804e145060dbabb623552a508f273f55fa8f.
Merge branch 'master' of github.com:derevjaginti/clipper
doesn't call some events
added noconflict