changed to flashblock-dev.js
Merge remote-tracking branch 'upstream/master'
new alias