Conflicts: public/coffee/ide/pdfng/directives/pdfRenderer.coffee public/coffee/ide/pdfng/directives/pdfViewer.coffee