revert master branch
update minified
resolve merge
fix failing test
update readme for cla$$.event
Merge remote-tracking branch 'origin/master' into coffee