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
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
Cleaned up treeview names
Added treeview support for displaying files