Fixed event issues
Merge branch 'master' of https://github.com/suhasg/changepond-skejul