del drafet/js/combo
Merge branch 'master' into canvas