updated INSTALL with correct settings_credentials.py filepath
Merge remote-tracking branch 'upstream/master'
Fixed keydown block when a document is not an active NB document.
fixed html scrolling bug
Merge pull request #123 from jenkliu/master

Update INSTALL
Only make 'annotated' download link available for PDF with comments
Fix so no download links are available for non-PDF files
Merge pull request #124 from jenkliu/master

Only make 'annotated' download link available for PDF with comments
Update docviewHtml5 viewHeight calculation.
Merge branch 'master' of https://github.com/nbproject/nbproject into import-annotation
Merge branch 'import-annotation' of https://github.com/nbproject/nbproject into import-annotation