both youtube and html are visible
Merge branch 'master' into dev

Conflicts:
	content/modules/dev/files.js
fix typo
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'dev' of github.com:nbproject/nbproject into dev
use email from settings
NotepaneView supports 'export' snippets for annotations
Notepaneview export message updated
Importing code implemented
Merge branch 'master' of https://github.com/nbproject/nbproject
Merge branch 'dev' into import-annotation
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
Merge pull request #124 from jenkliu/master

Only make 'annotated' download link available for PDF with comments