merge branch 'master' of https://github.com/leftees/clappr into leftees-master
merge branch 'master' of https://github.com/leftees/clappr into leftees-master

clappr/clappr,clappr/clappr,flavioribeiro/clappr,flavioribeiro/clappr,clappr/clappr,flavioribeiro/clappr