edwin miranda (Blackboard.js)

edwin miranda (Blackboard.js)
Merge remote-tracking branch 'origin/master' into Wardo