reformat code in annotation.js
fix problem with multiline annotations
solve conflicts with origin on lesson_controller.rb
Merge remote-tracking branch 'origin/master'
add podcast player