Merge branch 'Media-player' into 'master'

Gemfile

app/views/learning_objects/show.html.erb

public/pdfjs/build/pdf.js

public/pdfjs/build/pdf.worker.js

public/pdfjs/web/compatibility.js

public/pdfjs/web/debugger.js

public/pdfjs/web/images/annotation-check.svg

public/pdfjs/web/images/annotation-comment.svg

public/pdfjs/web/images/annotation-help.svg

public/pdfjs/web/images/annotation-insert.svg

public/pdfjs/web/images/annotation-key.svg

public/pdfjs/web/images/annotation-newparagraph.svg

public/pdfjs/web/images/annotation-note.svg

public/pdfjs/web/images/annotation-paragraph.svg

public/pdfjs/web/images/findbarButton-next-rtl.png

public/pdfjs/web/images/findbarButton-next.png

public/pdfjs/web/images/findbarButton-previous-rtl.png

public/pdfjs/web/images/findbarButton-previous.png

public/pdfjs/web/images/loading-icon.gif

public/pdfjs/web/images/loading-small.png