use email from settings
change default setting
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.
Add strikethrough to usernames of anonymously posted comments for admin
remove comment
Explain strikethrough & abstract is_admin
Move is_admin to _render() function
Merge pull request #129 from jenkliu/anon-strikethrough

Strikethrough usernames on anonymous comments for admin
Fix bug 133: printing sections names (cf commit 1552da60d2647118144fc37884c467ecf58ae7bb) broke the collage view
Merge branch 'master' into dev

Conflicts:
	apps/nbsite/settings.py